summaryrefslogtreecommitdiffstats
path: root/examples/sensors
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-12-29 12:33:39 +1000
committerQt by Nokia <qt-info@nokia.com>2011-12-29 04:37:50 +0100
commite22f9745568cfddcd589538bf89ea66abb1296d6 (patch)
tree59483f12b7706928504a68d1e7efac107c0807a2 /examples/sensors
parentae5c57208b6021122a15d4dcfbdb5be1984fde1b (diff)
Fixed shadow builds on platforms other than Windows.
This example .pro file was doing DESTDIR = $$OUT_PWD ... apparently to escape from the debug/release subdirectory on Windows. This is redundant on Linux, and actually harmful, because when DESTDIR is set, the generated makefile includes commands conceptually similar to: rm -f $$DESTDIR/$$TARGET mv $$OUT_PWD/$$TARGET $$DESTDIR/$$TARGET Therefore, if DESTDIR equals OUT_PWD, the TARGET itself is deleted. Change-Id: I73278d9aec0d37200c8bc9c9755145f4968b2684 Reviewed-by: Toby Tomkins Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'examples/sensors')
-rw-r--r--examples/sensors/grue/lib/lib.pro4
1 files changed, 3 insertions, 1 deletions
diff --git a/examples/sensors/grue/lib/lib.pro b/examples/sensors/grue/lib/lib.pro
index dcfd6895..8ff9b319 100644
--- a/examples/sensors/grue/lib/lib.pro
+++ b/examples/sensors/grue/lib/lib.pro
@@ -1,6 +1,8 @@
TEMPLATE = lib
TARGET = gruesensor
-DESTDIR = $$OUT_PWD
+
+# avoid going to release/debug subdirectory
+win32:DESTDIR = $$OUT_PWD
DEFINES *= QT_BUILD_GRUE_LIB
QT = core sensors