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/grue/import/import.pro | 13 +++---------- examples/sensors/sensor_explorer/import/import.pro | 13 +++---------- 2 files changed, 6 insertions(+), 20 deletions(-) (limited to 'examples') diff --git a/examples/sensors/grue/import/import.pro b/examples/sensors/grue/import/import.pro index 08b312db..e9b578fe 100644 --- a/examples/sensors/grue/import/import.pro +++ b/examples/sensors/grue/import/import.pro @@ -27,14 +27,7 @@ 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 -} - # 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/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/grue/import/import.json | 1 + examples/sensors/grue/import/import.pro | 2 +- examples/sensors/grue/import/main.cpp | 2 +- examples/sensors/grue/import/plugin.json | 1 - 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 - 8 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 examples/sensors/grue/import/import.json delete mode 100644 examples/sensors/grue/import/plugin.json create mode 100644 examples/sensors/sensor_explorer/import/import.json delete mode 100644 examples/sensors/sensor_explorer/import/plugin.json (limited to 'examples') diff --git a/examples/sensors/grue/import/import.json b/examples/sensors/grue/import/import.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/examples/sensors/grue/import/import.json @@ -0,0 +1 @@ +{} diff --git a/examples/sensors/grue/import/import.pro b/examples/sensors/grue/import/import.pro index e9b578fe..715df866 100644 --- a/examples/sensors/grue/import/import.pro +++ b/examples/sensors/grue/import/import.pro @@ -25,7 +25,7 @@ qmldir.path=$$DESTPATH INSTALLS += 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/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) { diff --git a/examples/sensors/grue/import/plugin.json b/examples/sensors/grue/import/plugin.json deleted file mode 100644 index 0967ef42..00000000 --- a/examples/sensors/grue/import/plugin.json +++ /dev/null @@ -1 +0,0 @@ -{} 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/accelbubble/accelbubble.pro | 3 +++ examples/sensors/grue/console_app/console_app.pro | 2 ++ examples/sensors/grue/import/import.pro | 2 ++ examples/sensors/grue/lib/lib.pro | 2 ++ examples/sensors/grue/plugin/plugin.pro | 2 ++ examples/sensors/grue/qml.pro | 4 ++++ examples/sensors/qmlsensorgestures/plugin/plugin.pro | 1 + examples/sensors/sensor_explorer/import/import.pro | 2 ++ examples/sensors/sensors.pro | 3 ++- examples/sensors/shakeit/shakeit.pro | 2 +- 10 files changed, 21 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/sensors/accelbubble/accelbubble.pro b/examples/sensors/accelbubble/accelbubble.pro index 4204f15b..d3b20a9d 100644 --- a/examples/sensors/accelbubble/accelbubble.pro +++ b/examples/sensors/accelbubble/accelbubble.pro @@ -23,3 +23,6 @@ QMAKE_INFO_PLIST = Info.plist } ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android + +EXAMPLE_FILES += \ + Info.plist diff --git a/examples/sensors/grue/console_app/console_app.pro b/examples/sensors/grue/console_app/console_app.pro index f2b627ec..3d3915f6 100644 --- a/examples/sensors/grue/console_app/console_app.pro +++ b/examples/sensors/grue/console_app/console_app.pro @@ -9,3 +9,5 @@ SOURCES = main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/sensors/grue INSTALLS += target + +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/sensors/grue/import/import.pro b/examples/sensors/grue/import/import.pro index 715df866..ab4d1779 100644 --- a/examples/sensors/grue/import/import.pro +++ b/examples/sensors/grue/import/import.pro @@ -20,6 +20,8 @@ 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 diff --git a/examples/sensors/grue/lib/lib.pro b/examples/sensors/grue/lib/lib.pro index 3442abe8..6106f9ed 100644 --- a/examples/sensors/grue/lib/lib.pro +++ b/examples/sensors/grue/lib/lib.pro @@ -13,3 +13,5 @@ SOURCES += gruesensor.cpp target.path=$$[QT_INSTALL_EXAMPLES]/sensors/grue INSTALLS += target + +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/sensors/grue/plugin/plugin.pro b/examples/sensors/grue/plugin/plugin.pro index 8aa87ae7..7edda279 100644 --- a/examples/sensors/grue/plugin/plugin.pro +++ b/examples/sensors/grue/plugin/plugin.pro @@ -24,5 +24,7 @@ SOURCES += gruesensorimpl.cpp \ target.path=$$[QT_INSTALL_EXAMPLES]/sensors/grue/$$PLUGIN_TYPE INSTALLS += target +CONFIG += install_ok # Do not cargo-cult this! + OTHER_FILES += \ plugin.json diff --git a/examples/sensors/grue/qml.pro b/examples/sensors/grue/qml.pro index 11d2c1de..3293c4f2 100644 --- a/examples/sensors/grue/qml.pro +++ b/examples/sensors/grue/qml.pro @@ -16,3 +16,7 @@ OTHER_FILES = \ target.path = $$[QT_INSTALL_EXAMPLES]/sensors/grue INSTALLS += target + +EXAMPLE_FILES += \ + grue.xcf \ + icon.xcf diff --git a/examples/sensors/qmlsensorgestures/plugin/plugin.pro b/examples/sensors/qmlsensorgestures/plugin/plugin.pro index 23ece17b..bb519c8d 100644 --- a/examples/sensors/qmlsensorgestures/plugin/plugin.pro +++ b/examples/sensors/qmlsensorgestures/plugin/plugin.pro @@ -7,6 +7,7 @@ PLUGIN_TYPE = sensorgestures PLUGIN_CLASS_NAME = QCounterGesturePlugin PLUGIN_EXTENDS = - load(qt_plugin) +CONFIG += install_ok } else { TEMPLATE = lib 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 diff --git a/examples/sensors/sensors.pro b/examples/sensors/sensors.pro index 953071cd..be51a62c 100644 --- a/examples/sensors/sensors.pro +++ b/examples/sensors/sensors.pro @@ -17,4 +17,5 @@ qtHaveModule(quick) { qtHaveModule(widgets): SUBDIRS += \ sensorgestures -OTHER_FILES = stub.h +EXAMPLE_FILES += \ + stub.h diff --git a/examples/sensors/shakeit/shakeit.pro b/examples/sensors/shakeit/shakeit.pro index 5e07f062..00eb1ab3 100644 --- a/examples/sensors/shakeit/shakeit.pro +++ b/examples/sensors/shakeit/shakeit.pro @@ -11,5 +11,5 @@ OTHER_FILES = \ audio \ content -target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/shakeit +target.path = $$[QT_INSTALL_EXAMPLES]/sensors/shakeit INSTALLS += target -- cgit v1.2.3