From fb698edb1e996719c98285c16ed881f42ddfbd77 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 25 Aug 2009 13:49:53 +1000 Subject: 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 --- tools/qdoc3/qdoc3.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v0.12