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(-) diff --git a/examples/sensors/grue/import/import.pro b/examples/sensors/grue/import/import.pro index 08b312d..e9b578f 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 a5fe441..d666353 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.1 From f32489e379805c51b28ae5d471491a649283fd8d Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 29 Apr 2016 11:29:42 +0200 Subject: Update QtSensors QML version for Qt 5.7 release Change-Id: I47e4537c8456e7b762da2a792f0584c1a783db56 Reviewed-by: Lorn Potter --- src/imports/sensors/plugins.qmltypes | 4 ++-- src/imports/sensors/sensors.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes index 2c72e1f..e1857a6 100644 --- a/src/imports/sensors/plugins.qmltypes +++ b/src/imports/sensors/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtSensors 5.6' +// 'qmlplugindump -nonrelocatable QtSensors 5.7' Module { dependencies: ["QtQuick 2.0"] @@ -52,7 +52,7 @@ Module { exports: [ "QtSensors/Altimeter 5.1", "QtSensors/Altimeter 5.2", - "QtSensors/Altimeter 5.6" + "QtSensors/Altimeter 5.7" ] exportMetaObjectRevisions: [0, 0, 0] } diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp index 27a648c..c6f61c2 100644 --- a/src/imports/sensors/sensors.cpp +++ b/src/imports/sensors/sensors.cpp @@ -222,10 +222,10 @@ public: qmlRegisterType (package, major, minor, "SensorGesture"); - // Register the 5.5 interfaces + // Register the 5.7 interfaces // No API changes, just reintroduce existing interfaces from 5.2 - // Implicitly registers 5.3 - 5.5 too - minor = 6; + // Implicitly registers 5.3 - 5.6 too + minor = 7; qmlRegisterType (package, major, minor, "Altimeter"); } }; -- cgit v1.2.1 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 diff --git a/examples/sensors/grue/import/import.json b/examples/sensors/grue/import/import.json new file mode 100644 index 0000000..0967ef4 --- /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 e9b578f..715df86 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 01d95c5..dc2372e 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 0967ef4..0000000 --- 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 0000000..0967ef4 --- /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 d666353..210bfa2 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 bf80d9f..03f83a3 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 0967ef4..0000000 --- a/examples/sensors/sensor_explorer/import/plugin.json +++ /dev/null @@ -1 +0,0 @@ -{} -- cgit v1.2.1 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(-) diff --git a/examples/sensors/accelbubble/accelbubble.pro b/examples/sensors/accelbubble/accelbubble.pro index 4204f15..d3b20a9 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 f2b627e..3d3915f 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 715df86..ab4d177 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 3442abe..6106f9e 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 8aa87ae..7edda27 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 11d2c1d..3293c4f 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 23ece17..bb519c8 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 210bfa2..6ba501c 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 953071c..be51a62 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 5e07f06..00eb1ab 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.1 From ce1e935c3bb96075b62a0ff3ca048d72c3c0fb7b Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 10 May 2016 14:54:29 +0200 Subject: Doc: Remove repository name from examplesinstallpath Examples in binary packages now directly match the install path. Change-Id: Ib617462a75ba94ff32689c8cc8f0fb10e2db4431 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko --- src/sensors/doc/qtsensors.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sensors/doc/qtsensors.qdocconf b/src/sensors/doc/qtsensors.qdocconf index 0506678..8b9b95d 100644 --- a/src/sensors/doc/qtsensors.qdocconf +++ b/src/sensors/doc/qtsensors.qdocconf @@ -46,7 +46,7 @@ exampledirs += ../../../examples/sensors \ snippets/ # Specify the install path under QT_INSTALL_EXAMPLES -examplesinstallpath = qtsensors/sensors +examplesinstallpath = sensors imagedirs += images -- cgit v1.2.1 From 6189199557a2b8eb981f37e6370b47c25b224b4e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 May 2016 13:27:14 +0200 Subject: Bump version Change-Id: Ib83512966f3fb2cf0e488b6ea71f72f353dcef2b --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index b642527..21c63db 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.6.1 +MODULE_VERSION = 5.6.2 -- cgit v1.2.1