From d59e85d9095f5d8fa787149fe8d34e8dfac0a0b5 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 1 Mar 2012 17:45:55 +0100 Subject: 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 --- configure | 3 --- tools/configure/configureapp.cpp | 4 ---- 2 files changed, 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; -- cgit v1.2.3