diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-19 08:06:23 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-19 08:06:50 +0200 |
| commit | 20a4655188bc86b34a58761f047f046229cf46c6 (patch) | |
| tree | 3100e62b3f9830c127d4ffb2f62c390014dd5b50 /examples/sensors/sensor_explorer/import/import.pro | |
| parent | f32489e379805c51b28ae5d471491a649283fd8d (diff) | |
| parent | 127ac0810f042999a13db18e68b43be9ab85e708 (diff) | |
| download | qtsensors-20a4655188bc86b34a58761f047f046229cf46c6.tar.gz | |
Merge remote-tracking branch 'gerrit/5.6' into 5.7
Change-Id: Ie2002a0be7fcb6bd9b81792a1e50b4ffb6c1acc3
Diffstat (limited to 'examples/sensors/sensor_explorer/import/import.pro')
| -rw-r--r-- | examples/sensors/sensor_explorer/import/import.pro | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/examples/sensors/sensor_explorer/import/import.pro b/examples/sensors/sensor_explorer/import/import.pro index a5fe441..6ba501c 100644 --- a/examples/sensors/sensor_explorer/import/import.pro +++ b/examples/sensors/sensor_explorer/import/import.pro @@ -24,17 +24,12 @@ qmldir.files=$$PWD/qmldir qmldir.path=$$DESTPATH INSTALLS += target qmldir -OTHER_FILES += \ - plugin.json qmldir - -copyfile = $$PWD/qmldir -copydest = $$DESTDIR +CONFIG += install_ok # Do not cargo-cult this! -# On Windows, use backslashes as directory separators -equals(QMAKE_HOST.os, Windows) { - copyfile ~= s,/,\\,g - copydest ~= s,/,\\,g -} +OTHER_FILES += \ + 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 |