diff options
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 |