summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-05-14 11:42:28 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-05-14 11:45:36 (GMT)
commit6d4e67674f0ca5824761ec29f20dd854d47b4ac7 (patch)
treefbb52216e460580def7545bdd0525f1ad16c6abb /tools/configure
parent3ecb04cffdf491f5ea01eceb71de98d6ac647107 (diff)
downloadQt-6d4e67674f0ca5824761ec29f20dd854d47b4ac7.zip
Qt-6d4e67674f0ca5824761ec29f20dd854d47b4ac7.tar.gz
Qt-6d4e67674f0ca5824761ec29f20dd854d47b4ac7.tar.bz2
define qtPrepareTool() function and use it throughout
the function provides a cross-platform way to determine the exact pathname of our build tools (moc, etc.). use it in our .prf files, so we don't have to rely on qmake's unreliable path separator normalization magic in extra compiler commands, which broke on mingw+sh in silent mode. remove the bootstrap tool path setting from configure, as it is redundant now. Reviewed-by: joerg Task-number: QTBUG-10633
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index b35f454..7319844 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2755,11 +2755,6 @@ 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") {