summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-11-26 10:54:31 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-11-26 10:54:31 +0100
commit3b2175c6a4311a25e12365422bec4d5d35ee996a (patch)
treefec6b371a77969924a2ebade9dfc014db35a7357
parent2d859d940b56ec4f692e5a48083380c69f9b2532 (diff)
parent6b9d3314bdc1dc7883bd4c1c3846056acd00eab1 (diff)
downloadqtsensors-3b2175c6a4311a25e12365422bec4d5d35ee996a.tar.gz
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I11d540f43baa69f9e857dd793666c1008b217956
-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 47e21fd..191098e 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 e018830..e2324a8 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 = \