diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:02:01 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:02:01 +0200 |
commit | a0a8e0395965f0a62ddaaa7c0ad8228aa9990476 (patch) | |
tree | 620478f2c88d6adc1a3cec5ceeffc4b8420e242e | |
parent | 90f43c450db8cad9f10d86c006f251dad91a4492 (diff) | |
parent | fa01244e5233c7c1f7a862121c079bff2d8e055c (diff) | |
download | qtsensors-a0a8e0395965f0a62ddaaa7c0ad8228aa9990476.tar.gz |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ic47f81aec558260a2271485dc953957cbed9ce67
17 files changed, 37 insertions, 32 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/plugin.json b/examples/sensors/grue/import/import.json index 0967ef4..0967ef4 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 08b312d..ab4d177 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 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/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/plugin.json b/examples/sensors/sensor_explorer/import/import.json index 0967ef4..0967ef4 100644 --- a/examples/sensors/sensor_explorer/import/plugin.json +++ b/examples/sensors/sensor_explorer/import/import.json 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 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/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 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 <QmlSensorGesture >(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 <QmlAltimeter >(package, major, minor, "Altimeter"); } }; 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 |