summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2013-11-20 13:55:23 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-21 07:11:22 +0100
commit6b9d3314bdc1dc7883bd4c1c3846056acd00eab1 (patch)
tree27d448c5de74c1f1e1b03058c45a87f0a84574ce
parenta840cbffba476205eba81f56f40ec32cea6097cc (diff)
QML examples: Avoid using release/debug output subdirectoryv5.2.0-rc1
Qt Sensors examples that include additional QML modules fail to run on Windows, because the application located under a debug or release subdirectory does not see the module import path. This change fixes the issue by adjusting examples' DESTDIR on Windows builds. Task-number: QTBUG-33875 Change-Id: Iab8ebc1acd80cf4fe88a7a35b44c42f767da5ccf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
-rw-r--r--examples/sensors/grue/qml.pro3
-rw-r--r--examples/sensors/sensor_explorer/qml.pro4
2 files changed, 7 insertions, 0 deletions
diff --git a/examples/sensors/grue/qml.pro b/examples/sensors/grue/qml.pro
index 47e21fd8..191098ec 100644
--- a/examples/sensors/grue/qml.pro
+++ b/examples/sensors/grue/qml.pro
@@ -2,6 +2,9 @@ TEMPLATE = app
TARGET = grue_app
QT += quick
+# Avoid going to release/debug subdirectory
+win32: DESTDIR = ./
+
SOURCES = main.cpp
RESOURCES += \
diff --git a/examples/sensors/sensor_explorer/qml.pro b/examples/sensors/sensor_explorer/qml.pro
index e018830d..e2324a84 100644
--- a/examples/sensors/sensor_explorer/qml.pro
+++ b/examples/sensors/sensor_explorer/qml.pro
@@ -5,6 +5,10 @@ QT += qml quick
qtHaveModule(widgets) {
QT += widgets
}
+
+# Avoid going to release/debug subdirectory
+win32: DESTDIR = ./
+
SOURCES = main.cpp
app.files = \