diff options
| author | Christian Strømme <christian.stromme@theqtcompany.com> | 2015-11-16 18:28:04 +0100 |
|---|---|---|
| committer | Christian Stromme <christian.stromme@theqtcompany.com> | 2015-11-24 16:06:59 +0000 |
| commit | 356c60f2aaf7881f08a07aaf38bece8bbaa39d8d (patch) | |
| tree | 8fe88b101c6bcf84865d1e41ec30400dd2755415 /examples/webview/minibrowser | |
| parent | ec675f5a6c086a6ca2ab301225fd8d17592121e4 (diff) | |
Remove deployment.pri from the minibrowser example
The minibrowser example was created using the Qt Creator templates,
which includes hard-coded install paths defined in deployment.pri.
For user applications that might make sense, but it doesn't for Qt
examples, instead we should install it into Qt's example directory.
Task-number: QTBUG-49431
Change-Id: Ia4c33574547a17a186125f10b3eaa14512f81dc8
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'examples/webview/minibrowser')
| -rw-r--r-- | examples/webview/minibrowser/deployment.pri | 27 | ||||
| -rw-r--r-- | examples/webview/minibrowser/minibrowser.pro | 8 |
2 files changed, 3 insertions, 32 deletions
diff --git a/examples/webview/minibrowser/deployment.pri b/examples/webview/minibrowser/deployment.pri deleted file mode 100644 index 5441b63..0000000 --- a/examples/webview/minibrowser/deployment.pri +++ /dev/null @@ -1,27 +0,0 @@ -android-no-sdk { - target.path = /data/user/qt - export(target.path) - INSTALLS += target -} else:android { - x86 { - target.path = /libs/x86 - } else: armeabi-v7a { - target.path = /libs/armeabi-v7a - } else { - target.path = /libs/armeabi - } - export(target.path) - INSTALLS += target -} else:unix { - isEmpty(target.path) { - qnx { - target.path = /tmp/$${TARGET}/bin - } else { - target.path = /opt/$${TARGET}/bin - } - export(target.path) - } - INSTALLS += target -} - -export(INSTALLS) diff --git a/examples/webview/minibrowser/minibrowser.pro b/examples/webview/minibrowser/minibrowser.pro index 0ef8b8a..827e87b 100644 --- a/examples/webview/minibrowser/minibrowser.pro +++ b/examples/webview/minibrowser/minibrowser.pro @@ -1,4 +1,5 @@ TEMPLATE = app +TARGET = minibrowser QT += qml quick webview @@ -10,8 +11,5 @@ RESOURCES += qml.qrc EXAMPLE_FILES += doc -# Additional import path used to resolve QML modules in Qt Creator's code model -QML_IMPORT_PATH = - -# Default rules for deployment. -include(deployment.pri) +target.path = $$[QT_INSTALL_EXAMPLES]/webview/minibrowser +INSTALLS += target |