diff options
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/default_pre.prf | 2 | ||||
-rw-r--r-- | mkspecs/features/qt_config.prf | 12 |
2 files changed, 3 insertions, 11 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 18d0d5f560..a88605b2b7 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -7,7 +7,7 @@ CONFIG = lex yacc warn_on debug exceptions $$CONFIG exists($$QTDIR/.qmake.cache) { QTFWD = -module-fwd $$QTDIR/mkspecs/modules -developer-build } else { - QTFWD = -module-fwd $$OUT_PWD/module-paths/modules -cache-module-fwd + QTFWD = -module-fwd $$OUT_PWD/mkspecs/modules -cache-module-fwd } qtPrepareTool(QMAKE_SYNCQT, syncqt) diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf index 514c018655..d797775306 100644 --- a/mkspecs/features/qt_config.prf +++ b/mkspecs/features/qt_config.prf @@ -1,19 +1,11 @@ -# 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_EXTRA_MODULE_FORWARDS = $$fromfile($$_QMAKE_CACHE_, QMAKE_EXTRA_MODULE_FORWARDS) -} QMAKE_QT_CONFIG = $$[QT_HOST_DATA/get]/mkspecs/qconfig.pri !exists($$QMAKE_QT_CONFIG)|!include($$QMAKE_QT_CONFIG, "", true) { debug(1, "Cannot load qconfig.pri!") } else { debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)") - for(dir, $$list($$unique($$list($$replace($$list($$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR)), \ - $, /modules) \ - $$QMAKE_EXTRA_MODULE_FORWARDS)))) { + for(dir, $$list($$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR))) { debug(1, "Loading modules from $${dir}") - for(mod, $$list($$files($$dir/qt_*.pri))) { + for(mod, $$list($$files($$dir/modules/qt_*.pri))) { # For installed Qt these paths will be common for all modules # For development these will vary per module, and syncqt will override the value in the # qt_<module>.pri forwarding file |