From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 25 Mar 2014 20:51:41 +0000 (+0100)
Subject: Properly find WebKit for Qt5
X-Git-Tag: 0.11.0~59
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=979a6d7363b0ccf9db3441f5c668d99ac34a8e44;hp=27e9a474a8c205829067a017f7d7fbde0891c42a

Properly find WebKit for Qt5

It's WebKit, not Webkit.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47a672e7..8be04113 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,14 +189,22 @@ if(USE_QT5)
         )
 
         if (WITH_WEBKIT)
-            find_package(Qt5Webkit QUIET)
-            set_package_properties(Qt5Webkit PROPERTIES TYPE RECOMMENDED
+            find_package(Qt5WebKit QUIET)
+            set_package_properties(Qt5WebKit PROPERTIES TYPE RECOMMENDED
                 URL "http://qt.digia.com"
-                DESCRIPTION "a Webkit implementation for Qt"
+                DESCRIPTION "a WebKit implementation for Qt"
                 PURPOSE     "Needed for displaying previews for URLs in chat"
             )
+            if (Qt5WebKit_FOUND)
+                find_package(Qt5WebKitWidgets QUIET)
+                set_package_properties(Qt5WebKitWidgets PROPERTIES TYPE RECOMMENDED
+                    URL "http://qt.digia.com"
+                    DESCRIPTION "widgets for Qt's WebKit implementation"
+                    PURPOSE     "Needed for displaying previews for URLs in chat"
+                )
+            endif()
         endif()
-        add_feature_info("WITH_WEBKIT and QtWebkit module" Qt5Webkit_FOUND "Support showing previews for URLs in chat")
+        add_feature_info("WITH_WEBKIT, QtWebKit and QtWebKitWidgets modules" Qt5WebKitWidgets_FOUND "Support showing previews for URLs in chat")
 
     endif(BUILD_GUI)
     if (BUILD_CORE)
@@ -254,7 +262,7 @@ else(USE_QT5)
         if (WITH_WEBKIT AND QT_QTWEBKIT_FOUND)
             set(HAVE_WEBKIT true)
         endif()
-        add_feature_info("WITH_WEBKIT and QtWebkit module" HAVE_WEBKIT "Support showing previews for URLs in chat")
+        add_feature_info("WITH_WEBKIT and QtWebKit module" HAVE_WEBKIT "Support showing previews for URLs in chat")
 
         if (WITH_KDE)
             # KDE has overzealous CFLAGS making miniz not compile, so save our old flags
diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index 5c7371e5..86ec6158 100644
--- a/src/qtui/CMakeLists.txt
+++ b/src/qtui/CMakeLists.txt
@@ -123,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)