diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:02:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:02:01 +0200 |
| commit | a0a8e0395965f0a62ddaaa7c0ad8228aa9990476 (patch) | |
| tree | 620478f2c88d6adc1a3cec5ceeffc4b8420e242e /examples/sensors/grue/import/import.pro | |
| parent | 90f43c450db8cad9f10d86c006f251dad91a4492 (diff) | |
| parent | fa01244e5233c7c1f7a862121c079bff2d8e055c (diff) | |
| download | qtsensors-a0a8e0395965f0a62ddaaa7c0ad8228aa9990476.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ic47f81aec558260a2271485dc953957cbed9ce67
Diffstat (limited to 'examples/sensors/grue/import/import.pro')
| -rw-r--r-- | examples/sensors/grue/import/import.pro | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/examples/sensors/grue/import/import.pro b/examples/sensors/grue/import/import.pro index 08b312d..ab4d177 100644 --- a/examples/sensors/grue/import/import.pro +++ b/examples/sensors/grue/import/import.pro @@ -20,21 +20,16 @@ DESTPATH=$$[QT_INSTALL_EXAMPLES]/sensors/grue/Grue target.path=$$DESTPATH INSTALLS += target +CONFIG += install_ok # Do not cargo-cult this! + qmldir.files=$$PWD/qmldir qmldir.path=$$DESTPATH INSTALLS += qmldir OTHER_FILES += \ - plugin.json qmldir - -copyfile = $$PWD/qmldir -copydest = $$DESTDIR - -# On Windows, use backslashes as directory separators -equals(QMAKE_HOST.os, Windows) { - copyfile ~= s,/,\\,g - copydest ~= s,/,\\,g -} + import.json qmldir # Copy the qmldir file to the same folder as the plugin binary -QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$copyfile) $$quote($$copydest) $$escape_expand(\\n\\t) +cpqmldir.files = $$PWD/qmldir +cpqmldir.path = $$DESTDIR +COPIES += cpqmldir |