Properly find WebKit for Qt5

[quassel.git] / src / qtui / CMakeLists.txt

diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index cb040e0..86ec615 100644 (file)
--- a/src/qtui/CMakeLists.txt
+++ b/src/qtui/CMakeLists.txt
@@ -110,7 +110,11 @@ if (QT_QTDBUS_FOUND OR Qt5DBus_FOUND)
     if (dbusmenu-qt_FOUND OR dbusmenu-qt5_FOUND)
         add_definitions(-DHAVE_DBUSMENU)
         include_directories(${dbusmenu-qt_INCLUDE_DIRS} ${dbusmenu-qt5_INCLUDE_DIRS})
-        list(APPEND LIBS ${dbusmenu-qt_LIBRARIES} ${dbusmenu-qt5_LIBRARIES})
+        if (dbusmenu-qt_FOUND)
+            list(APPEND LIBS dbusmenu-qt)
+        else()
+            list(APPEND LIBS dbusmenu-qt5)
+        endif()
     endif()
 
     list(APPEND SOURCES statusnotifieritem.cpp statusnotifieritemdbus.cpp dockmanagernotificationbackend.cpp)
@@ -119,9 +123,12 @@ if (QT_QTDBUS_FOUND OR Qt5DBus_FOUND)
     qt_add_dbus_adaptor  (SOURCES ../../interfaces/org.kde.StatusNotifierItem.xml statusnotifieritemdbus.h StatusNotifierItemDBus)
 endif()
 
-if (QT_QTWEBKIT_FOUND OR Qt5Webkit_FOUND)
+if (QT_QTWEBKIT_FOUND OR Qt5WebKitWidgets_FOUND)
     add_definitions(-DHAVE_WEBKIT)
-    list(APPEND QT_MODULES Webkit XmlPatterns)
+    list(APPEND QT_MODULES WebKit XmlPatterns)
+    if (USE_QT5)
+        list(APPEND QT_MODULES WebKitWidgets)
+    endif()
 endif()
 
 if(HAVE_SSL)