summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-08-06 16:17:22 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-08-11 07:57:12 (GMT)
commit199b7ccb2a82e6a87808c3873c158ca38120dfdf (patch)
tree96dd7b208248df0a59e0dc1daaae8d031e0305b3 /tools/configure
parentbf992abf98056151def8ff0b853fce8f1924b02a (diff)
downloadQt-199b7ccb2a82e6a87808c3873c158ca38120dfdf.zip
Qt-199b7ccb2a82e6a87808c3873c158ca38120dfdf.tar.gz
Qt-199b7ccb2a82e6a87808c3873c158ca38120dfdf.tar.bz2
fix loading of module configs
do it in qt_config.prf instead of in the autogenerated qconfig.pri files. this is waaaay more elegant, and allows us to easily use the magic in that file which avoids loading qt configuration from the qt install dir while building qt itself. Reviewed-by: joerg Reviewed-by: Simon Hausmann Task-number: QTBUG-12698
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index a0ca33a..0c716d1 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2944,8 +2944,6 @@ void Configure::generateCachefile()
configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl;
}
- configStream << "#modules" << endl << "for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod)" << endl;
-
configStream.flush();
configFile.close();
}