summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-25 03:49:53 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-25 05:02:25 (GMT)
commitfb698edb1e996719c98285c16ed881f42ddfbd77 (patch)
tree29b6fab502839f33cb0a3ac2eb2e438464c4cfcd /tools
parent81c094621d64b5a6547c232c7282582339b16045 (diff)
downloadQt-fb698edb1e996719c98285c16ed881f42ddfbd77.zip
Qt-fb698edb1e996719c98285c16ed881f42ddfbd77.tar.gz
Qt-fb698edb1e996719c98285c16ed881f42ddfbd77.tar.bz2
Restore old behaviour if qdoc3 is built without $QT_BUILD_TREE set.
Third time lucky. The first attempt broke source package builds, because $$QT_BUILD_TREE is not set if you just run qmake on qdoc3.pro, causing the generated Makefile to try to build /bin/qdoc3. The second attempt caused similar problems if you weren't building qdoc3 at least three levels below the root directory, plus the generated makefile had the target "../../bin/qdoc3" instead of "qdoc3". Reviewed-by: Lincoln Ramsay
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/qdoc3.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index 99edcf4..bacef3f 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -7,7 +7,7 @@ DEFINES += QT_NO_CAST_TO_ASCII
QT = core xml
CONFIG += console
CONFIG -= debug_and_release_target
-DESTDIR = ../../bin
+!isEmpty(QT_BUILD_TREE):DESTDIR = $$QT_BUILD_TREE/bin
#CONFIG += debug
build_all:!build_pass {
CONFIG -= build_all