diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 06:34:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 06:34:04 +0200 |
| commit | afc84775efdc6e13e2e210bb94e115b378d90134 (patch) | |
| tree | 24985cc95111ecf2b637019363a32414b95860fe /examples/qml/tutorials/extending-qml/chapter6-plugins | |
| parent | 6371b208a9e55845090dcd34234e314c6587c105 (diff) | |
| parent | 72515ebe5a63c201fde09471bc646dbe15110a6b (diff) | |
| download | qtdeclarative-afc84775efdc6e13e2e210bb94e115b378d90134.tar.gz | |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Change-Id: Ib7f8c60143c1efab279476dba390a3d9837ccc37
Diffstat (limited to 'examples/qml/tutorials/extending-qml/chapter6-plugins')
| -rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro | 3 | ||||
| -rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro b/examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro index 4d0e807417..b340981e42 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro @@ -13,3 +13,6 @@ osx { SOURCES += main.cpp RESOURCES += app.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter6-plugins +INSTALLS += target diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro index cefcf3b477..5cf4621420 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro @@ -20,7 +20,11 @@ qmldir.files=$$PWD/qmldir qmldir.path=$$DESTPATH INSTALLS += target qmldir +CONFIG += install_ok # Do not cargo-cult this! + OTHER_FILES += qmldir # Copy the qmldir file to the same folder as the plugin binary -QMAKE_POST_LINK += $$QMAKE_COPY $$replace($$list($$quote($$PWD/qmldir) $$DESTDIR), /, $$QMAKE_DIR_SEP) +cpqmldir.files = qmldir +cpqmldir.path = $$DESTDIR +COPIES += cpqmldir |