projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5931bed
)
Make compile on top of the current master branch
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Thu, 3 Jul 2008 22:58:45 +0000
(
00:58
+0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Tue, 22 Jul 2008 19:42:35 +0000
(21:42 +0200)
CMakeLists.txt
patch
|
blob
|
history
src/client/CMakeLists.txt
patch
|
blob
|
history
src/qtui/CMakeLists.txt
patch
|
blob
|
history
src/qtui/settingspages/generalsettingspage.cpp
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
29fd963
..
57af949
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-174,7
+174,7
@@
if(WANT_CORE)
endif(WANT_CORE)
if(WANT_QTCLIENT)
endif(WANT_CORE)
if(WANT_QTCLIENT)
- setup_qt4_variables(GUI NETWORK)
+ setup_qt4_variables(
DBUS
GUI NETWORK)
add_executable(quasselclient WIN32 ${CMAKE_SOURCE_DIR}/src/common/main.cpp
${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_I18N} ${WIN32_RC})
set_target_properties(quasselclient PROPERTIES
add_executable(quasselclient WIN32 ${CMAKE_SOURCE_DIR}/src/common/main.cpp
${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_I18N} ${WIN32_RC})
set_target_properties(quasselclient PROPERTIES
@@
-184,7
+184,7
@@
if(WANT_QTCLIENT)
endif(WANT_QTCLIENT)
if(WANT_MONO)
endif(WANT_QTCLIENT)
if(WANT_MONO)
- setup_qt4_variables(GUI NETWORK SCRIPT SQL)
+ setup_qt4_variables(
DBUS
GUI NETWORK SCRIPT SQL)
add_executable(quassel WIN32 ${CMAKE_SOURCE_DIR}/src/common/main.cpp
${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_SQL} ${RC_I18N} ${WIN32_RC})
set_target_properties(quassel PROPERTIES
add_executable(quassel WIN32 ${CMAKE_SOURCE_DIR}/src/common/main.cpp
${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_SQL} ${RC_I18N} ${WIN32_RC})
set_target_properties(quassel PROPERTIES
diff --git
a/src/client/CMakeLists.txt
b/src/client/CMakeLists.txt
index
5f4baeb
..
db78880
100644
(file)
--- a/
src/client/CMakeLists.txt
+++ b/
src/client/CMakeLists.txt
@@
-3,6
+3,7
@@
# We still have some minor deps to QtUi: QItemSelectionModel
# set(QT_DONT_USE_QTGUI 1)
set(QT_USE_QTNETWORK 1)
# We still have some minor deps to QtUi: QItemSelectionModel
# set(QT_DONT_USE_QTGUI 1)
set(QT_USE_QTNETWORK 1)
+set(QT_USE_QTDBUS 1)
include(${QT_USE_FILE})
set(SOURCES
include(${QT_USE_FILE})
set(SOURCES
@@
-14,6
+15,7
@@
set(SOURCES
clientirclisthelper.cpp
clientsettings.cpp
clientsyncer.cpp
clientirclisthelper.cpp
clientsettings.cpp
clientsyncer.cpp
+ desktopnotifications.cpp
irclistmodel.cpp
mappedselectionmodel.cpp
networkmodel.cpp
irclistmodel.cpp
mappedselectionmodel.cpp
networkmodel.cpp
@@
-28,6
+30,7
@@
set(MOC_HDRS
clientcoreinfo.h
clientirclisthelper.h
clientsyncer.h
clientcoreinfo.h
clientirclisthelper.h
clientsyncer.h
+ desktopnotifications.h
irclistmodel.h
networkmodel.h
mappedselectionmodel.h
irclistmodel.h
networkmodel.h
mappedselectionmodel.h
diff --git
a/src/qtui/CMakeLists.txt
b/src/qtui/CMakeLists.txt
index
e7525bf
..
8605c74
100644
(file)
--- a/
src/qtui/CMakeLists.txt
+++ b/
src/qtui/CMakeLists.txt
@@
-2,6
+2,7
@@
set(QT_DONT_USE_QTGUI 0)
set(QT_USE_QTNETWORK 1)
set(QT_DONT_USE_QTGUI 0)
set(QT_USE_QTNETWORK 1)
+set(QT_USE_QTDBUS 1)
include(${QT_USE_FILE})
set(SOURCES
include(${QT_USE_FILE})
set(SOURCES
diff --git
a/src/qtui/settingspages/generalsettingspage.cpp
b/src/qtui/settingspages/generalsettingspage.cpp
index
6139ad5
..
db21c39
100644
(file)
--- a/
src/qtui/settingspages/generalsettingspage.cpp
+++ b/
src/qtui/settingspages/generalsettingspage.cpp
@@
-149,8
+149,8
@@
void GeneralSettingsPage::save() {
uiSettings.setValue("AnimateTrayIcon", ui.animateTrayIcon->isChecked());
//<<< HEAD:src/qtui/settingspages/generalsettingspage.cpp
uiSettings.setValue("AnimateTrayIcon", ui.animateTrayIcon->isChecked());
//<<< HEAD:src/qtui/settingspages/generalsettingspage.cpp
- uiSettings.setValue("DisplayPopupMessages", ui.displayPopupMessages->isChecked());
- uiSettings.setValue("CompletionSuffix", ui.completionSuffix->text());
+
//
uiSettings.setValue("DisplayPopupMessages", ui.displayPopupMessages->isChecked());
+
//
uiSettings.setValue("CompletionSuffix", ui.completionSuffix->text());
//=======
uiSettings.setValue("NotificationBubble", ui.bubbleBox->isChecked());
//=======
uiSettings.setValue("NotificationBubble", ui.bubbleBox->isChecked());