path: root/mkspecs
diff options
authorMarius Storm-Olsen <>2011-03-30 11:59:54 -0500
committerOlivier Goffart <>2011-05-02 15:30:08 +0200
commit738d5c7c85230c740a7e86cb66c452c5719cc7e8 (patch)
treee804f7ec6749e6ffa1f745ae76a401e607d15a93 /mkspecs
parent5aaa38c7ac9370fa6f61581f4b5e57dd6d119ec0 (diff)
Make sure we don't always pull in modules from installed mkspecs
When building Qt, qmake should not pull in mkspecs from an installed version, as this will lead to incorrect paths for the current build. So, here we ensure only to pull in modules from there we detected the qconfig.pri, and ensure we still handle the QMAKEPATH case used by some.
Diffstat (limited to 'mkspecs')
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf
index 5afd82c84a..071bb6c237 100644
--- a/mkspecs/features/qt_config.prf
+++ b/mkspecs/features/qt_config.prf
@@ -12,7 +12,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) {
} else {
debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)")
for(dir, $$list($$unique($$list($$dirname(QMAKE_QT_CONFIG) \
- $$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR))))) {
+ $$replace($$list($$split($$list($$(QMAKEPATH)), $$DIRLIST_SEPARATOR)), $, /mkspecs))))) {
debug(1, "Loading modules from $${dir}")
for(mod, $$list($$files($$dir/modules/qt_*.pri))) {
# For installed Qt these paths will be common for all modules