diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-06 16:17:22 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-08-19 03:30:44 (GMT) |
| commit | 8305a9e833003b9f5018f7ae0ad8d175b6361df8 (patch) | |
| tree | ce4af0e477d67f7cd1efe57405261539cefb440c | |
| parent | 3e095417325c6184203c346e850cfe1d1bb044a2 (diff) | |
| download | Qt-8305a9e833003b9f5018f7ae0ad8d175b6361df8.zip Qt-8305a9e833003b9f5018f7ae0ad8d175b6361df8.tar.gz Qt-8305a9e833003b9f5018f7ae0ad8d175b6361df8.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
| -rw-r--r-- | mkspecs/features/qt_config.prf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf index 0a2d985..3145341 100644 --- a/mkspecs/features/qt_config.prf +++ b/mkspecs/features/qt_config.prf @@ -8,6 +8,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { debug(1, "Cannot load qconfig.pri!") } else { debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)") + for(mod, $$list($$files($$dirname(QMAKE_QT_CONFIG)/modules/qt_*.pri))):include($$mod) } load(qt_functions) |