X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2FCMakeLists.txt;h=3564dc31ac8b15ce59de9c789e1da73c1f656ae2;hp=3861d609384fdc20b60caf2e9fa056af6b7f228b;hb=0216d4a650c02155b5bcd517567209f674d8a120;hpb=4af261c83c6dfd578886afc6da23e5ded067b5c9

diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index 3861d609..3564dc31 100644
--- a/src/qtui/CMakeLists.txt
+++ b/src/qtui/CMakeLists.txt
@@ -88,13 +88,6 @@ set(FORMS
 set(LIBS )
 set(QT_MODULES )
 
-if (WITH_KDE4)
-    add_definitions(-DHAVE_KDE ${KDE4_DEFINITIONS})
-    include_directories(${KDE4_INCLUDES})
-    list(APPEND SOURCES knotificationbackend.cpp)
-    list(APPEND LIBS ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBRARY})
-endif()
-
 if (WITH_KF5)
     list(APPEND SOURCES knotificationbackend.cpp)
     list(APPEND LIBS KF5::ConfigWidgets KF5::Notifications KF5::NotifyConfig KF5::WidgetsAddons KF5::XmlGui)
@@ -114,7 +107,7 @@ if (Qt5Multimedia_FOUND)
     set(FORMS ${FORMS}     qtmultimedianotificationconfigwidget.ui)
 endif()
 
-if (PHONON_FOUND OR Phonon4Qt5_FOUND)
+if (Phonon4Qt5_FOUND)
     add_definitions(-DHAVE_PHONON)
     include_directories(${PHONON_INCLUDES})
     set(SOURCES ${SOURCES} phononnotificationbackend.cpp)
@@ -122,39 +115,29 @@ if (PHONON_FOUND OR Phonon4Qt5_FOUND)
     list(APPEND LIBS ${PHONON_LIBS})  # PHONON_LIBRARIES only exists in config mode, it's not set by the legacy FindPhonon.cmake
 endif()
 
-if (QT_QTDBUS_FOUND OR Qt5DBus_FOUND)
+if (Qt5DBus_FOUND)
     add_definitions(-DHAVE_DBUS)
     list(APPEND QT_MODULES DBus)
-    if (dbusmenu-qt_FOUND OR dbusmenu-qt5_FOUND)
+    if (dbusmenu-qt5_FOUND)
         add_definitions(-DHAVE_DBUSMENU)
-        include_directories(${dbusmenu-qt_INCLUDE_DIRS} ${dbusmenu-qt5_INCLUDE_DIRS})
-        if (dbusmenu-qt_FOUND)
-            list(APPEND LIBS dbusmenu-qt)
-        else()
-            list(APPEND LIBS dbusmenu-qt5)
-        endif()
+        include_directories(${dbusmenu-qt5_INCLUDE_DIRS})
+        list(APPEND LIBS dbusmenu-qt5)
     endif()
 
     list(APPEND SOURCES statusnotifieritem.cpp statusnotifieritemdbus.cpp dockmanagernotificationbackend.cpp)
-    qt_add_dbus_interface(SOURCES ../../interfaces/org.kde.StatusNotifierWatcher.xml statusnotifierwatcher)
-    qt_add_dbus_interface(SOURCES ../../interfaces/org.freedesktop.Notifications.xml notificationsclient)
-    qt_add_dbus_adaptor  (SOURCES ../../interfaces/org.kde.StatusNotifierItem.xml statusnotifieritemdbus.h StatusNotifierItemDBus)
+    qt5_add_dbus_interface(SOURCES ../../interfaces/org.kde.StatusNotifierWatcher.xml statusnotifierwatcher)
+    qt5_add_dbus_interface(SOURCES ../../interfaces/org.freedesktop.Notifications.xml notificationsclient)
+    qt5_add_dbus_adaptor  (SOURCES ../../interfaces/org.kde.StatusNotifierItem.xml statusnotifieritemdbus.h StatusNotifierItemDBus)
 endif()
 
 if (HAVE_WEBKIT)
     add_definitions(-DHAVE_WEBKIT)
-    list(APPEND QT_MODULES WebKit)
-    if (USE_QT5)
-        list(APPEND QT_MODULES WebKitWidgets)
-    endif()
+    list(APPEND QT_MODULES WebKit WebKitWidgets)
 endif()
 
 if (HAVE_WEBENGINE)
     add_definitions(-DHAVE_WEBENGINE)
-    list(APPEND QT_MODULES WebEngine)
-    if (USE_QT5)
-        list(APPEND QT_MODULES WebEngineWidgets)
-    endif()
+    list(APPEND QT_MODULES WebEngine WebEngineWidgets)
 endif()
 
 if(HAVE_SSL)
@@ -162,14 +145,6 @@ if(HAVE_SSL)
   set(FORMS ${FORMS} sslinfodlg.ui)
 endif()
 
-if (INDICATEQT_FOUND)
-    add_definitions(-DHAVE_INDICATEQT)
-    include_directories(${INDICATEQT_INCLUDE_DIRS})
-    list(APPEND SOURCES indicatornotificationbackend.cpp)
-    list(APPEND FORMS   indicatornotificationconfigwidget.ui)
-    list(APPEND LIBS ${INDICATEQT_LIBRARIES})
-endif()
-
 if (WITH_NOTIFICATION_CENTER)
     add_definitions(-DHAVE_NOTIFICATION_CENTER)
     list(APPEND SOURCES osxnotificationbackend.mm)
@@ -206,14 +181,9 @@ include_directories(${CMAKE_SOURCE_DIR}/src/common
                     ${CMAKE_SOURCE_DIR}/src/uisupport
 )
 
-qt_wrap_ui(UI ${FORMPATH} ${SPFRM})
-
-if (USE_QT5)
-    list(APPEND QT_MODULES Widgets)
-endif()
-
+qt5_wrap_ui(UI ${FORMPATH} ${SPFRM})
 
 add_library(mod_qtui STATIC ${SOURCES} ${SPSRC} ${UI})
-qt_use_modules(mod_qtui Core Gui Network ${QT_MODULES})
+qt5_use_modules(mod_qtui Core Gui Network Widgets ${QT_MODULES})
 
 target_link_libraries(mod_qtui mod_client mod_common mod_uisupport ${LIBS})