summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-03-01 17:45:55 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-08 23:52:34 +0100
commitd59e85d9095f5d8fa787149fe8d34e8dfac0a0b5 (patch)
treea01375953be630772fc98f3390fdc4b3a3ef07e7
parenta0933f4d7485d22f38b80c67f79b8d3f721b19a2 (diff)
remove the fixed qt tool assignments from the configures
the tool locations are now determined with qtPrepareTool(), which takes non-installed qt builds into account already. Change-Id: I17b2c5f4b181417f2a612be2f540768e7dc0ae4e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rwxr-xr-xconfigure3
-rw-r--r--tools/configure/configureapp.cpp4
2 files changed, 0 insertions, 7 deletions
diff --git a/configure b/configure
index 8df49a9928..756088d517 100755
--- a/configure
+++ b/configure
@@ -6722,9 +6722,6 @@ QT_BUILD_TREE = \$\$quote($outpath)
QT_BUILD_PARTS = $CFG_BUILD_PARTS
#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
-QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc
-QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic
-QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index a586821bdc..eafe547063 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2512,10 +2512,6 @@ void Configure::generateCachefile()
//so that we can build without an install first (which would be impossible)
moduleStream << "#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR" << endl;
- moduleStream << "QMAKE_MOC = $$QT_BUILD_TREE" << fixSeparators("/bin/moc.exe", true) << endl;
- moduleStream << "QMAKE_UIC = $$QT_BUILD_TREE" << fixSeparators("/bin/uic.exe", true) << endl;
- moduleStream << "QMAKE_RCC = $$QT_BUILD_TREE" << fixSeparators("/bin/rcc.exe", true) << endl;
- moduleStream << "QMAKE_DUMPCPP = $$QT_BUILD_TREE" << fixSeparators("/bin/dumpcpp.exe", true) << endl;
moduleStream << "QMAKE_INCDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/include", true) << endl;
moduleStream << "QMAKE_LIBDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/lib", true) << endl;