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 4204f15b..d3b20a9d 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 f2b627ec..3d3915f6 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 715df866..ab4d1779 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 3442abe8..6106f9ed 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 8aa87ae7..7edda279 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 11d2c1de..3293c4f2 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 23ece17b..bb519c8d 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 210bfa29..6ba501c7 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 953071cd..be51a62c 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 5e07f062..00eb1ab3 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.3