From c77494fcf6f637069157d5607195755d687ea86a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 22 Apr 2016 20:57:00 +0200 Subject: make use of COPIES Change-Id: I1df10894b0d0e4adba411db2dfc818f8bd39f6df Reviewed-by: Joerg Bornemann --- examples/sensors/sensor_explorer/import/import.pro | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'examples/sensors/sensor_explorer') diff --git a/examples/sensors/sensor_explorer/import/import.pro b/examples/sensors/sensor_explorer/import/import.pro index a5fe441f..d666353c 100644 --- a/examples/sensors/sensor_explorer/import/import.pro +++ b/examples/sensors/sensor_explorer/import/import.pro @@ -27,14 +27,7 @@ INSTALLS += target 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 -} - # 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 -- cgit v1.2.3 From e005c91966c4f2ed29baa84f2961261bda6400b9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 20:47:07 +0200 Subject: make plugin .json naming better follow the project structure it's more intuitive that way, and easier to deal with for the example source install magic. Change-Id: I547717463756c4b0bb86e401abfb5ddf7a605020 Reviewed-by: Alex Blasche --- examples/sensors/sensor_explorer/import/import.json | 1 + examples/sensors/sensor_explorer/import/import.pro | 2 +- examples/sensors/sensor_explorer/import/main.cpp | 2 +- examples/sensors/sensor_explorer/import/plugin.json | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 examples/sensors/sensor_explorer/import/import.json delete mode 100644 examples/sensors/sensor_explorer/import/plugin.json (limited to 'examples/sensors/sensor_explorer') diff --git a/examples/sensors/sensor_explorer/import/import.json b/examples/sensors/sensor_explorer/import/import.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/examples/sensors/sensor_explorer/import/import.json @@ -0,0 +1 @@ +{} diff --git a/examples/sensors/sensor_explorer/import/import.pro b/examples/sensors/sensor_explorer/import/import.pro index d666353c..210bfa29 100644 --- a/examples/sensors/sensor_explorer/import/import.pro +++ b/examples/sensors/sensor_explorer/import/import.pro @@ -25,7 +25,7 @@ qmldir.path=$$DESTPATH INSTALLS += target qmldir OTHER_FILES += \ - plugin.json qmldir + import.json qmldir # Copy the qmldir file to the same folder as the plugin binary cpqmldir.files = $$PWD/qmldir diff --git a/examples/sensors/sensor_explorer/import/main.cpp b/examples/sensors/sensor_explorer/import/main.cpp index bf80d9ff..03f83a33 100644 --- a/examples/sensors/sensor_explorer/import/main.cpp +++ b/examples/sensors/sensor_explorer/import/main.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class SensorExplorerDeclarativeModule : 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) { diff --git a/examples/sensors/sensor_explorer/import/plugin.json b/examples/sensors/sensor_explorer/import/plugin.json deleted file mode 100644 index 0967ef42..00000000 --- a/examples/sensors/sensor_explorer/import/plugin.json +++ /dev/null @@ -1 +0,0 @@ -{} -- cgit v1.2.3 From 127ac0810f042999a13db18e68b43be9ab85e708 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 20:46:30 +0200 Subject: fix example installs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id7b94644f9db10bce3ef3539f4ff275f5f6f37b0 Reviewed-by: Topi Reiniö Reviewed-by: Joerg Bornemann --- examples/sensors/sensor_explorer/import/import.pro | 2 ++ 1 file changed, 2 insertions(+) (limited to 'examples/sensors/sensor_explorer') diff --git a/examples/sensors/sensor_explorer/import/import.pro b/examples/sensors/sensor_explorer/import/import.pro index 210bfa29..6ba501c7 100644 --- a/examples/sensors/sensor_explorer/import/import.pro +++ b/examples/sensors/sensor_explorer/import/import.pro @@ -24,6 +24,8 @@ qmldir.files=$$PWD/qmldir qmldir.path=$$DESTPATH INSTALLS += target qmldir +CONFIG += install_ok # Do not cargo-cult this! + OTHER_FILES += \ import.json qmldir -- cgit v1.2.3