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

Change-Id: Ie2002a0be7fcb6bd9b81792a1e50b4ffb6c1acc3

3 files changed, 7 insertions, 12 deletions

diff --git a/examples/sensors/sensor_explorer/import/plugin.json b/examples/sensors/sensor_explorer/import/import.json
index 0967ef42..0967ef42 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 a5fe441f..6ba501c7 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 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)
     {