From 738d5c7c85230c740a7e86cb66c452c5719cc7e8 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Wed, 30 Mar 2011 11:59:54 -0500 Subject: 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. --- mkspecs/features/qt_config.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3