diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-03 10:41:51 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-03 10:41:51 (GMT) |
| commit | 6e18291266ed33c27c35f069f6915c353d96ee8c (patch) | |
| tree | 6fa1aa32b9a842870dbf7ebcfeeebf247dd83179 /mkspecs | |
| parent | 5f073cb596b938c1b39621cefd38a3decc6f6fa2 (diff) | |
| parent | 8a73e64bfe86e572260c888d5523c8e973c2f7fe (diff) | |
| download | Qt-6e18291266ed33c27c35f069f6915c353d96ee8c.zip Qt-6e18291266ed33c27c35f069f6915c353d96ee8c.tar.gz Qt-6e18291266ed33c27c35f069f6915c353d96ee8c.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into qt-master-from-4.7
Diffstat (limited to 'mkspecs')
| -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) |