diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-15 15:00:58 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-19 19:45:31 +0200 |
| commit | 2b0da5b2799e1157d46f095093f370f2eef9c3ae (patch) | |
| tree | 5ddbd036241fba3481c7488ccc5ba10f829f6828 /src | |
| parent | 8ac43f74c02408e08491defb7d7c91f0d5ce1d39 (diff) | |
Adapt to WebKit module changes
QtQuick1 uses the Widgets related API of QtWebKit and hence needs
to use the QtWebKitWidgets module.
Change-Id: Idf2e65d053e1dbf2501486c8f0a22b8b25f23efc
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/imports.pro | 2 | ||||
| -rw-r--r-- | src/imports/webview/webview.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 5e125212..8c9d6b95 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -3,4 +3,4 @@ TEMPLATE = subdirs SUBDIRS += folderlistmodel particles gestures contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1): SUBDIRS += shaders -!isEmpty(QT.webkit.name): SUBDIRS += webview +!isEmpty(QT.webkitwidgets.name): SUBDIRS += webview diff --git a/src/imports/webview/webview.pro b/src/imports/webview/webview.pro index e46d9efe..f64ed481 100644 --- a/src/imports/webview/webview.pro +++ b/src/imports/webview/webview.pro @@ -2,7 +2,7 @@ TARGET = qmlwebkitplugin TARGETPATH = QtQuick1/QtWebKit include(../qimportbase.pri) -QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private webkit +QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private webkitwidgets SOURCES += qdeclarativewebview.cpp plugin.cpp HEADERS += qdeclarativewebview_p.h |