Adapt to QtWebKit module changes

The widget specific API of QtWebKit is split out into a separate QtWebKitWidgets
module. Assistant and Designer use the widget specific API and therefore
need to use QT += webkitwidgets instead of QT += webkit.

Change-Id: I57b829428e079f454560676c48536aae8de15ed4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>

diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
index 5eee8e6..d4c0b56 100644 (file)
--- a/src/assistant/assistant/assistant.pro
+++ b/src/assistant/assistant/assistant.pro
@@ -2,8 +2,8 @@ TEMPLATE = app
 LANGUAGE = C++
 TARGET = assistant
 DESTDIR = $$QT.help.bins
-!isEmpty(QT.webkit.name) {
-    QT += webkit
+!isEmpty(QT.webkitwidgets.name) {
+    QT += webkitwidgets
 } else {
     DEFINES += QT_NO_WEBKIT
 }
@@ -85,7 +85,7 @@ SOURCES += aboutdialog.cpp \
     openpageswidget.cpp \
     openpagesmanager.cpp \
     openpagesswitcher.cpp
-contains(QT_CONFIG, webkit) {
+contains(QT_CONFIG, webkitwidgets) {
     SOURCES += helpviewer_qwv.cpp
 } else {
     SOURCES += helpviewer_qtb.cpp

diff --git a/src/assistant/assistant/globalactions.cpp b/src/assistant/assistant/globalactions.cpp
index 865738f..2af9ed4 100644 (file)
--- a/src/assistant/assistant/globalactions.cpp
+++ b/src/assistant/assistant/globalactions.cpp
@@ -49,7 +49,7 @@
 #include <QtWidgets/QMenu>
 
 #if !defined(QT_NO_WEBKIT)
-#include <QtWebKit/QWebHistory>
+#include <QWebHistory>
 #endif
 
 GlobalActions *GlobalActions::instance(QObject *parent)

diff --git a/src/assistant/assistant/helpviewer.h b/src/assistant/assistant/helpviewer.h
index 8a1013a..e614858 100644 (file)
--- a/src/assistant/assistant/helpviewer.h
+++ b/src/assistant/assistant/helpviewer.h
@@ -53,7 +53,7 @@
 #if defined(QT_NO_WEBKIT)
 #include <QtWidgets/QTextBrowser>
 #else
-#include <QtWebKit/QWebView>
+#include <QWebView>
 #endif
 
 QT_BEGIN_NAMESPACE

diff --git a/src/assistant/assistant/main.cpp b/src/assistant/assistant/main.cpp
index e15ef62..e709161 100644 (file)
--- a/src/assistant/assistant/main.cpp
+++ b/src/assistant/assistant/main.cpp
@@ -61,7 +61,7 @@
 
 #if !defined(QT_NO_WEBKIT)
 #include <QtGui/QFont>
-#include <QtWebKit/QWebSettings>
+#include <QWebSettings>
 #endif
 
 #include "../shared/collectionconfiguration.h"

diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro
index 628d44c..5f04597 100644 (file)
--- a/src/designer/src/plugins/plugins.pro
+++ b/src/designer/src/plugins/plugins.pro
@@ -3,5 +3,5 @@ CONFIG += ordered
 
 REQUIRES = !CONFIG(static,shared|static)
 # contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
-contains(QT_CONFIG, webkit): SUBDIRS += qwebview
+contains(QT_CONFIG, webkitwidgets): SUBDIRS += qwebview
 # win32: contains(QT_CONFIG, activeqt): SUBDIRS += activeqt

diff --git a/src/designer/src/plugins/qwebview/qwebview.pro b/src/designer/src/plugins/qwebview/qwebview.pro
index f5fe431..ad25010 100644 (file)
--- a/src/designer/src/plugins/qwebview/qwebview.pro
+++ b/src/designer/src/plugins/qwebview/qwebview.pro
@@ -1,7 +1,7 @@
 TEMPLATE    = lib
 TARGET      = qwebview
 CONFIG     += qt warn_on plugin
-QT         += widgets webkit
+QT         += widgets webkitwidgets
 
 include(../plugins.pri)
 

diff --git a/src/designer/src/plugins/qwebview/qwebview_plugin.cpp b/src/designer/src/plugins/qwebview/qwebview_plugin.cpp
index a1c6fe1..58080be 100644 (file)
--- a/src/designer/src/plugins/qwebview/qwebview_plugin.cpp
+++ b/src/designer/src/plugins/qwebview/qwebview_plugin.cpp
@@ -45,7 +45,7 @@
 #include <QtDesigner/QExtensionManager>
 
 #include <QtCore/qplugin.h>
-#include <QtWebKit/QWebView>
+#include <QWebView>
 
 static const char *toolTipC = "QtWebKit Web widget";
 
@@ -79,7 +79,7 @@ QString QWebViewPlugin::whatsThis() const
 
 QString QWebViewPlugin::includeFile() const
 {
-    return QStringLiteral("QtWebKit/QWebView");
+    return QStringLiteral("QtWebKitWidgets/QWebView");
 }
 
 QIcon QWebViewPlugin::icon() const