diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-26 10:49:56 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-27 15:37:57 +0200 |
| commit | a8b637e9b70bb420690523cd3f77f139813deec8 (patch) | |
| tree | 4eba1ed7253baaddf76581312bf0318f5293e055 /src | |
| parent | 3ef5a2374862c82076427ca42e334aaaeb21ca45 (diff) | |
Add QtQuick1 WebKit integration (from QtWebKit module)
This adds the QML1 QDeclarativeWebView integration to the default build (it was
added a while ago) as well as the unit tests.
Change-Id: I7324f5a3b00716d4b300e8c11d9ea3b8b9577da3
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/imports.pro | 1 | ||||
| -rw-r--r-- | src/imports/webview/webview.pro | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index d0e24b0b..5e125212 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -3,3 +3,4 @@ TEMPLATE = subdirs SUBDIRS += folderlistmodel particles gestures contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1): SUBDIRS += shaders +!isEmpty(QT.webkit.name): SUBDIRS += webview diff --git a/src/imports/webview/webview.pro b/src/imports/webview/webview.pro index a24e9372..9ed375db 100644 --- a/src/imports/webview/webview.pro +++ b/src/imports/webview/webview.pro @@ -1,5 +1,5 @@ TARGET = qmlwebkitplugin -TARGETPATH = QtWebKit +TARGETPATH = QtQuick1/QtWebKit include(../qimportbase.pri) QT += quick1 quick1-private widgets widgets-private gui gui-private core-private script-private webkit @@ -10,9 +10,9 @@ HEADERS += qdeclarativewebview_p.h OTHER_FILES += plugin.json DESTDIR = $$QT.quick1.imports/$$TARGETPATH -target.path = $$[QT_INSTALL_IMPORTS]/QtQuick1/$$TARGETPATH +target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir -qmldir.path += $$[QT_INSTALL_IMPORTS]/QtQuick1/$$TARGETPATH +qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH INSTALLS += target qmldir |