summaryrefslogtreecommitdiffstats
path: root/configure
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 /configure
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 'configure')
-rwxr-xr-xconfigure5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure b/configure
index 057d39a..0cf7542 100755
--- a/configure
+++ b/configure
@@ -7198,6 +7198,11 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
#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_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
+QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
+QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib