From 2b0da5b2799e1157d46f095093f370f2eef9c3ae Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 15 Oct 2012 15:00:58 +0200 Subject: 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 --- src/imports/imports.pro | 2 +- src/imports/webview/webview.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/imports') 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 -- cgit v1.2.3