X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2FCMakeLists.txt;h=311931e962eae49cdcd3538c99345a4e0ba36ce2;hp=9a0b1209ef955cd52e04e93b5b1d54b83fd46578;hb=0de0a17782cf478d638a532f36898197af88e0bc;hpb=d8d9cc49774faf66170790ea687c37584e5e7a51

diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index 9a0b1209..311931e9 100644
--- a/src/qtui/CMakeLists.txt
+++ b/src/qtui/CMakeLists.txt
@@ -1,23 +1,20 @@
 # Builds the qtui module
 
-set(QT_DONT_USE_QTGUI 0)
-set(QT_USE_QTNETWORK 1)
+set(_modules )
+
+if(WITH_QT5)
+  list(APPEND _modules Widgets)
+endif(WITH_QT5)
+
 if(HAVE_DBUS)
-  set(QT_USE_QTDBUS 1)
+  list(APPEND _modules DBus)
 endif(HAVE_DBUS)
+
 if(HAVE_WEBKIT)
-  set(QT_USE_QTWEBKIT 1)
-  set(QT_USE_XMLPATTERNS 1)
+  list(APPEND _modules Webkit XmlPatterns)
 endif(HAVE_WEBKIT)
-include(${QT_USE_FILE})
 
-if (QCA2_FOUND)
-  include_directories(${QCA2_INCLUDE_DIR})
-endif (QCA2_FOUND)
-
-if(INDICATEQT_FOUND)
-  include_directories(${INDICATEQT_INCLUDE_DIRS})
-endif(INDICATEQT_FOUND)
+setup_qt_variables(Gui Network ${_modules})
 
 set(SOURCES
     aboutdlg.cpp
@@ -58,6 +55,7 @@ set(SOURCES
     qtuimessageprocessor.cpp
     qtuisettings.cpp
     qtuistyle.cpp
+    receivefiledlg.cpp
     settingsdlg.cpp
     settingspagedlg.cpp
     simplenetworkeditor.cpp
@@ -67,59 +65,8 @@ set(SOURCES
     titlesetter.cpp
     topicwidget.cpp
     verticaldock.cpp
-    webpreviewitem.cpp)
-
-set(MOC_HDRS
-    aboutdlg.h
-    awaylogfilter.h
-    awaylogview.h
-    bufferwidget.h
-    channellistdlg.h
-    chatitem.h
-    chatlinemodel.h
-    chatmonitorfilter.h
-    chatmonitorview.h
-    chatscene.h
-    chatview.h
-    chatviewsearchbar.h
-    chatviewsearchcontroller.h
-    columnhandleitem.h
-    coreconfigwizard.h
-    coreconnectdlg.h
-    coreconnectionstatuswidget.h
-    coreinfodlg.h
-    debugbufferviewoverlay.h
-    debugconsole.h
-    debuglogwidget.h
-    debugmessagemodelfilter.h
-    inputwidget.h
-    ircconnectionwizard.h
-    legacysystemtray.h
-    mainpage.h
-    mainwin.h
-    markerlineitem.h
-    msgprocessorstatuswidget.h
-    nicklistwidget.h
-    qtui.h
-    qtuiapplication.h
-    qtuimessageprocessor.h
-    qtuistyle.h
-    settingsdlg.h
-    settingspagedlg.h
-    simplenetworkeditor.h
-    systemtray.h
-    systraynotificationbackend.h
-    taskbarnotificationbackend.h
-    titlesetter.h
-    topicwidget.h
-    verticaldock.h)
-
-set(HEADERS
-    chatline.h
-    chatlinemodelitem.h
-    chatviewsettings.h
-    qtuisettings.h
-    webpreviewitem.h)
+    webpreviewitem.cpp
+)
 
 set(FORMS
     aboutdlg.ui
@@ -143,71 +90,83 @@ set(FORMS
     settingsdlg.ui
     settingspagedlg.ui
     simplenetworkeditor.ui
+    receivefiledlg.ui
     topicwidget.ui)
 
 if(HAVE_KDE)
   set(SOURCES ${SOURCES} knotificationbackend.cpp)
-  set(MOC_HDRS ${MOC_HDRS} knotificationbackend.h)
 else(HAVE_KDE)
+  if(HAVE_SNORENOTIFY)
+    set(SOURCES ${SOURCES} snorenotificationbackend.cpp)
+    set(FORMS ${FORMS} snorentificationconfigwidget.ui)
+  endif(HAVE_SNORENOTIFY)
   if(HAVE_PHONON)
     set(SOURCES ${SOURCES} phononnotificationbackend.cpp)
-    set(MOC_HDRS ${MOC_HDRS} phononnotificationbackend.h)
     set(FORMS ${FORMS} phononnotificationconfigwidget.ui)
     include_directories(${PHONON_INCLUDES})
   endif(HAVE_PHONON)
 endif(HAVE_KDE)
 
 if(HAVE_DBUS)
-  set(SOURCES ${SOURCES} statusnotifieritem.cpp statusnotifieritemdbus.cpp)
-  set(MOC_HDRS ${MOC_HDRS} statusnotifieritem.h statusnotifieritemdbus.h)
+  set(SOURCES ${SOURCES} statusnotifieritem.cpp statusnotifieritemdbus.cpp dockmanagernotificationbackend.cpp)
   set(FORMS ${FORMS})
-  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)  
+  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)
   set(FORMS ${FORMS} sslinfodlg.ui)
 endif(HAVE_SSL)
 
 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)
+endif()
+
 foreach(FORM ${FORMS})
   set(FORMPATH ${FORMPATH} ui/${FORM})
 endforeach(FORM ${FORMS})
 
 # handle settingspages
-include(settingspages/settingspages.inc)
+include(settingspages/settingspages.cmake)
 foreach(SP ${SETTINGSPAGES})
   set(SPSRC ${SPSRC} settingspages/${SP}settingspage.cpp)
-  set(SPHDR ${SPHDR} settingspages/${SP}settingspage.h)
   set(SPFRM ${SPFRM} settingspages/${SP}settingspage.ui)
 endforeach(SP ${SETTINGSPAGES})
 foreach(SRC ${SP_SOURCES})
   set(SPSRC ${SPSRC} settingspages/${SRC})
 endforeach(SRC ${SP_SOURCES})
-foreach(HDR ${SP_HEADERS})
-  set(SPHDR ${SPHDR} settingspages/${HDR})
-endforeach(HDR ${SP_HEADERS})
 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_ui(UI ${FORMPATH} ${SPFRM})
+endif(WITH_QT5)
 
-add_library(mod_qtui STATIC ${SOURCES} ${SPSRC} ${MOC} ${DBUS} ${UI} ${HEADERS})
+add_library(mod_qtui STATIC ${SOURCES} ${SPSRC} ${DBUS} ${UI})
 add_dependencies(mod_qtui mod_common mod_client mod_uisupport)
+set_target_properties(mod_qtui PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_COMPILEFLAGS}")