diff options
| author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-02-08 10:57:34 (GMT) |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-02-08 10:57:34 (GMT) |
| commit | eb7958c65b09569c2531d2c443a6d0fe0b507d97 (patch) | |
| tree | 91544e4a4cf5c65b3acec7c219ebe63176a14994 /mkspecs/features/qt_config.prf | |
| parent | ef998bca70a799806c5754edfa49ea625881bc3e (diff) | |
| parent | 44298c848ac254fe1942eb32eed7651dec5bf0e3 (diff) | |
| download | Qt-eb7958c65b09569c2531d2c443a6d0fe0b507d97.zip Qt-eb7958c65b09569c2531d2c443a6d0fe0b507d97.tar.gz Qt-eb7958c65b09569c2531d2c443a6d0fe0b507d97.tar.bz2 | |
Merge branch 'master-upstream'
Diffstat (limited to 'mkspecs/features/qt_config.prf')
| -rw-r--r-- | mkspecs/features/qt_config.prf | 6 |
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) |