From e22f9745568cfddcd589538bf89ea66abb1296d6 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Thu, 29 Dec 2011 12:33:39 +1000 Subject: 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 Reviewed-by: Toby Tomkins --- examples/sensors/grue/lib/lib.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'examples/sensors') 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 -- cgit v1.2.3