diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-11 08:59:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-11 08:59:19 (GMT) |
| commit | a00dda686367807d6cc90f3cfca5453200565501 (patch) | |
| tree | 3828f949f1c44d89f400b0edf23bc3c0ceb5fec2 /mkspecs/features | |
| parent | 176852d24835dc5a14efa94ffe2a0ba58151fd4c (diff) | |
| parent | 199b7ccb2a82e6a87808c3873c158ca38120dfdf (diff) | |
| download | Qt-a00dda686367807d6cc90f3cfca5453200565501.zip Qt-a00dda686367807d6cc90f3cfca5453200565501.tar.gz Qt-a00dda686367807d6cc90f3cfca5453200565501.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix loading of module configs
don't load modules from qt.prf
add comment explaining why this file does magic instead of just voodoo
configure.exe: don't write the QT_NAMESPACE define to .qmake.cache
Don't build bearercloud example if Qt was build w/o SVG support
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/qt_config.prf | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index aa0f06e..07c89dd 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -31,9 +31,6 @@ plugin { #Qt plugins } } -#handle modules -for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod) - #handle includes INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf index 0a2d985..19e01a1 100644 --- a/mkspecs/features/qt_config.prf +++ b/mkspecs/features/qt_config.prf @@ -1,3 +1,6 @@ +# This file is loaded by the mkspecs, before .qmake.cache has been loaded. +# Consequently, we have to do some stunts to get values out of the cache. + exists($$_QMAKE_CACHE_):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG) isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { !isEmpty(QT_BUILD_TREE):QMAKE_QT_CONFIG = $$QT_BUILD_TREE/mkspecs/qconfig.pri @@ -8,6 +11,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) |