Merge remote-tracking branch 'gerrit/5.6' into 5.7

Change-Id: Ie2002a0be7fcb6bd9b81792a1e50b4ffb6c1acc3

14 files changed, 31 insertions, 26 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