summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-05-17 13:04:11 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-05-17 13:04:11 (GMT)
commiteb79e5ebf67de67f8c7bf3db20ceae93b46252b3 (patch)
tree30c06f4c34bbc4dd1b4525af81516ba5b20cb545 /tools
parentbe41deb3868de28187aba5743f71a71f8498e4c7 (diff)
downloadQt-eb79e5ebf67de67f8c7bf3db20ceae93b46252b3.zip
Qt-eb79e5ebf67de67f8c7bf3db20ceae93b46252b3.tar.gz
Qt-eb79e5ebf67de67f8c7bf3db20ceae93b46252b3.tar.bz2
re-add overriding of tool paths to configure
unlike originally planned, we didn't remove the setting of the tool paths from the qmake specs - for compat reasons. however, that means that they will make the QT_BUILD_TREE handling in qtPrepareTool ineffective, which meant that the qt build would try to use the tools from an installed qt ...
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 7319844..b35f454 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2755,6 +2755,11 @@ void Configure::generateCachefile()
cacheStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl;
//so that we can build without an install first (which would be impossible)
+ cacheStream << "QMAKE_MOC = $$QT_BUILD_TREE" << fixSeparators("/bin/moc.exe") << endl;
+ cacheStream << "QMAKE_UIC = $$QT_BUILD_TREE" << fixSeparators("/bin/uic.exe") << endl;
+ cacheStream << "QMAKE_UIC3 = $$QT_BUILD_TREE" << fixSeparators("/bin/uic3.exe") << endl;
+ cacheStream << "QMAKE_RCC = $$QT_BUILD_TREE" << fixSeparators("/bin/rcc.exe") << endl;
+ cacheStream << "QMAKE_DUMPCPP = $$QT_BUILD_TREE" << fixSeparators("/bin/dumpcpp.exe") << endl;
cacheStream << "QMAKE_INCDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/include") << endl;
cacheStream << "QMAKE_LIBDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/lib") << endl;
if (dictionary["CETEST"] == "yes") {