summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2011-02-02 16:16:15 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-02-02 16:16:15 (GMT)
commit210726453ff3ca0f16f036683e17097e1b62d458 (patch)
tree04329c5dc43e406c6019ce69275c67944016b055 /mkspecs
parent1d9a0a2192bb9a2f2cff97fba8a7ee5668f8ae56 (diff)
downloadQt-210726453ff3ca0f16f036683e17097e1b62d458.zip
Qt-210726453ff3ca0f16f036683e17097e1b62d458.tar.gz
Qt-210726453ff3ca0f16f036683e17097e1b62d458.tar.bz2
Load modules from QMAKEPATH
With this commit one can install qt_pkg.pri to $someprefix/mkspecs/modules and export QMAKEPATH=$someprefix. Merge-request: 2559 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_config.prf6
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf
index 19e01a1..de1cac4 100644
--- a/mkspecs/features/qt_config.prf
+++ b/mkspecs/features/qt_config.prf
@@ -11,7 +11,11 @@ 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)
+ for(dir, $$list($$unique($$list($$dirname(QMAKE_QT_CONFIG) \
+ $$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR))))) {
+ debug(1, "Loading modules from $${dir}")
+ for(mod, $$list($$files($$dir/modules/qt_*.pri))):include($$mod)
+ }
}
load(qt_functions)