X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2FCMakeLists.txt;h=7f67c9de39c89b07f60e744fd5ccd0f8de3558a4;hp=3e7e067023b4246ea8312a50f358ecbd20ef4394;hb=f04db2cb802b1296ca739c823495930c71d3b4ab;hpb=e052c6532456d818b804ce726c8a6e66c81ad8a0

diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index 3e7e0670..7f67c9de 100644
--- a/src/qtui/CMakeLists.txt
+++ b/src/qtui/CMakeLists.txt
@@ -1,13 +1,20 @@
 # Builds the qtui module
 
-set(QT_DONT_USE_QTGUI 0)
-set(QT_USE_QTNETWORK 1)
-set(QT_USE_QTDBUS 1)
-include(${QT_USE_FILE})
+set(_modules )
 
-if(INDICATEQT_FOUND)
-  include_directories(${INDICATEQT_INCLUDE_DIRS})
-endif(INDICATEQT_FOUND)
+if(WITH_QT5)
+  list(APPEND _modules Widgets)
+endif(WITH_QT5)
+
+if(HAVE_DBUS)
+  list(APPEND _modules DBus)
+endif(HAVE_DBUS)
+
+if(HAVE_WEBKIT)
+  list(APPEND _modules Webkit XmlPatterns)
+endif(HAVE_WEBKIT)
+
+setup_qt_variables(Gui Network ${_modules})
 
 set(SOURCES
     aboutdlg.cpp
@@ -37,9 +44,10 @@ set(SOURCES
     debugmessagemodelfilter.cpp
     inputwidget.cpp
     ircconnectionwizard.cpp
-    jumpkeyhandler.cpp
+    legacysystemtray.cpp
     mainpage.cpp
     mainwin.cpp
+    markerlineitem.cpp
     msgprocessorstatuswidget.cpp
     nicklistwidget.cpp
     qtui.cpp
@@ -83,9 +91,10 @@ set(MOC_HDRS
     debugmessagemodelfilter.h
     inputwidget.h
     ircconnectionwizard.h
-    jumpkeyhandler.h
+    legacysystemtray.h
     mainpage.h
     mainwin.h
+    markerlineitem.h
     msgprocessorstatuswidget.h
     nicklistwidget.h
     qtui.h
@@ -120,6 +129,7 @@ set(FORMS
     coreconfigwizardstorageselectionpage.ui
     coreconfigwizardsyncpage.ui
     coreconnectauthdlg.ui
+    coreconnectionstatuswidget.ui
     coreinfodlg.ui
     debugbufferviewoverlay.ui
     debugconsole.ui
@@ -136,13 +146,6 @@ if(HAVE_KDE)
   set(SOURCES ${SOURCES} knotificationbackend.cpp)
   set(MOC_HDRS ${MOC_HDRS} knotificationbackend.h)
 else(HAVE_KDE)
-  if(HAVE_DBUS)
-    set(SOURCES ${SOURCES} desktopnotificationbackend.cpp)
-    set(MOC_HDRS ${MOC_HDRS} desktopnotificationbackend.h)
-    set(FORMS ${FORMS} desktopnotificationconfigwidget.ui)
-    qt4_add_dbus_interface(DBUS ../../interfaces/org.freedesktop.Notifications.xml desktopnotificationinterface)
-  endif(HAVE_DBUS)
-
   if(HAVE_PHONON)
     set(SOURCES ${SOURCES} phononnotificationbackend.cpp)
     set(MOC_HDRS ${MOC_HDRS} phononnotificationbackend.h)
@@ -151,6 +154,21 @@ else(HAVE_KDE)
   endif(HAVE_PHONON)
 endif(HAVE_KDE)
 
+if(HAVE_DBUS)
+  set(SOURCES ${SOURCES} statusnotifieritem.cpp statusnotifieritemdbus.cpp dockmanagernotificationbackend.cpp)
+  set(MOC_HDRS ${MOC_HDRS} statusnotifieritem.h statusnotifieritemdbus.h dockmanagernotificationbackend.h)
+  set(FORMS ${FORMS})
+  if(WITH_QT5)
+    qt5_add_dbus_interface(DBUS ../../interfaces/org.kde.StatusNotifierWatcher.xml statusnotifierwatcher)
+    qt5_add_dbus_interface(DBUS ../../interfaces/org.freedesktop.Notifications.xml notificationsclient)
+    qt5_add_dbus_adaptor(DBUS ../../interfaces/org.kde.StatusNotifierItem.xml statusnotifieritemdbus.h StatusNotifierItemDBus)
+  else(WITH_QT5)
+    qt4_add_dbus_interface(DBUS ../../interfaces/org.kde.StatusNotifierWatcher.xml statusnotifierwatcher)
+    qt4_add_dbus_interface(DBUS ../../interfaces/org.freedesktop.Notifications.xml notificationsclient)
+    qt4_add_dbus_adaptor(DBUS ../../interfaces/org.kde.StatusNotifierItem.xml statusnotifieritemdbus.h StatusNotifierItemDBus)
+  endif(WITH_QT5)
+endif(HAVE_DBUS)
+
 if(HAVE_SSL)
   set(SOURCES ${SOURCES} sslinfodlg.cpp)
   set(MOC_HDRS ${MOC_HDRS} sslinfodlg.h)
@@ -161,8 +179,14 @@ if(INDICATEQT_FOUND)
   set(SOURCES ${SOURCES} indicatornotificationbackend.cpp)
   set(MOC_HDRS ${MOC_HDRS} indicatornotificationbackend.h)
   set(FORMS ${FORMS} indicatornotificationconfigwidget.ui)
+  include_directories(${INDICATEQT_INCLUDE_DIRS})
 endif(INDICATEQT_FOUND)
 
+if(HAVE_NOTIFICATION_CENTER)
+  set(SOURCES ${SOURCES} osxnotificationbackend.mm)
+  set(MOC_HDRS ${MOC_HDRS} osxnotificationbackend.h)
+endif()
+
 foreach(FORM ${FORMS})
   set(FORMPATH ${FORMPATH} ui/${FORM})
 endforeach(FORM ${FORMS})
@@ -184,15 +208,21 @@ foreach(FRM ${SP_FORMS})
   set(SPFRM ${SPFRM} settingspages/${FRM})
 endforeach(FRM ${SP_FORMS})
 
-qt4_wrap_cpp(MOC ${MOC_HDRS} ${SPHDR})
-qt4_wrap_ui(UI ${FORMPATH} ${SPFRM})
-
 include_directories(${CMAKE_SOURCE_DIR}/src/common
                     ${CMAKE_SOURCE_DIR}/src/client
                     ${CMAKE_SOURCE_DIR}/src/qtui
                     ${CMAKE_SOURCE_DIR}/src/qtui/settingspages
                     ${CMAKE_SOURCE_DIR}/src/uisupport
-                    ${CMAKE_CURRENT_BINARY_DIR})
+                    ${CMAKE_CURRENT_BINARY_DIR}
+                    ${QUASSEL_QT_INCLUDES})
+
+if(WITH_QT5)
+  qt5_wrap_ui(UI ${FORMPATH} ${SPFRM})
+else(WITH_QT5)
+  qt4_wrap_cpp(MOC ${MOC_HDRS} ${SPHDR})
+  qt4_wrap_ui(UI ${FORMPATH} ${SPFRM})
+endif(WITH_QT5)
 
 add_library(mod_qtui STATIC ${SOURCES} ${SPSRC} ${MOC} ${DBUS} ${UI} ${HEADERS})
 add_dependencies(mod_qtui mod_common mod_client mod_uisupport)
+set_target_properties(mod_qtui PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_COMPILEFLAGS}")