diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-20 10:50:46 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-20 10:50:53 +0200 |
| commit | fa01244e5233c7c1f7a862121c079bff2d8e055c (patch) | |
| tree | 71d03cadce14ee59dc64cab13b5910a0e6e07f1a /examples/sensors/grue/import | |
| parent | f32489e379805c51b28ae5d471491a649283fd8d (diff) | |
| parent | 8698282befc874bd38862558350f3f1993ba0053 (diff) | |
Merge remote-tracking branch 'gerrit/5.7' into 5.7.0
Change-Id: I2568fef18d7edbf4377739920538ee2ec4c8ec22
Diffstat (limited to 'examples/sensors/grue/import')
| -rw-r--r-- | examples/sensors/grue/import/import.json (renamed from examples/sensors/grue/import/plugin.json) | 0 | ||||
| -rw-r--r-- | examples/sensors/grue/import/import.pro | 17 | ||||
| -rw-r--r-- | examples/sensors/grue/import/main.cpp | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/examples/sensors/grue/import/plugin.json b/examples/sensors/grue/import/import.json index 0967ef42..0967ef42 100644 --- a/examples/sensors/grue/import/plugin.json +++ b/examples/sensors/grue/import/import.json diff --git a/examples/sensors/grue/import/import.pro b/examples/sensors/grue/import/import.pro index 08b312db..ab4d1779 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 diff --git a/examples/sensors/grue/import/main.cpp b/examples/sensors/grue/import/main.cpp index 01d95c53..dc2372e2 100644 --- a/examples/sensors/grue/import/main.cpp +++ b/examples/sensors/grue/import/main.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class GrueSensorQmlImport : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "import.json") public: virtual void registerTypes(const char *uri) { |