7 files changed, 17 insertions, 12 deletions
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