diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-09-18 18:26:09 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-26 12:20:52 +0200 |
commit | e8170aee1fd2e423d92616fbdf1c173d9e4b7913 (patch) | |
tree | 50f435179723215133bce28693f2928c63caeaf5 /mkspecs/features/qt_build_config.prf | |
parent | 938dbe1d93a10d6a68d0d715c2c9d508aa1c2b37 (diff) |
move QMAKEMODULES addition to .qmake.super to qt_build_config.prf
this is qt module specific magic that has no business in the generic
default_pre.prf.
a side effect is that every qt module now needs to have a .qmake.conf
(unless it sets MODULE_QMAKE_OUTDIR, like webkit does).
Change-Id: Id9e5f6eee2d8ec0c711e7217d9e1893fc9c88132
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/features/qt_build_config.prf')
-rw-r--r-- | mkspecs/features/qt_build_config.prf | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf index a2ad4429c1..01605da5e8 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf @@ -9,6 +9,16 @@ debug(1, "Not loading qmodule.pri twice") } +!build_pass:!isEmpty(_QMAKE_SUPER_CACHE_):!exists($$[QT_HOST_DATA]/.qmake.cache) { + # When doing a -prefix build of top-level qt5/qt.pro, we need to announce + # this repo's module pris' location to the other repos. + isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$shadowed($$dirname(_QMAKE_CONF_)) + modpath = $$MODULE_QMAKE_OUTDIR/mkspecs/modules + !contains(QMAKEMODULES, $$modpath): \ + cache(QMAKEMODULES, add super, modpath) + unset(modpath) +} + mac { !isEmpty(QMAKE_RPATHDIR){ CONFIG += absolute_library_soname |