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/default_pre.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/default_pre.prf')
| -rw-r--r-- | mkspecs/features/default_pre.prf | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 8b9cae5a6d..8f8916ae19 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -1,20 +1,6 @@ load(exclusive_builds) CONFIG = lex yacc warn_on debug exceptions depend_includepath $$CONFIG -!build_pass:exists($$_PRO_FILE_PWD_/sync.profile) { - !exists($$[QT_HOST_DATA]/.qmake.cache) { - !isEmpty(_QMAKE_SUPER_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 = $$OUT_PWD - modpath = $$MODULE_QMAKE_OUTDIR/mkspecs/modules - !contains(QMAKEMODULES, $$modpath): \ - cache(QMAKEMODULES, add super, modpath) - unset(modpath) - } - } -} - # Populate the installdir which will be passed to qdoc in the default_post.prf # This allows a project to remove the installdir if need be, to trigger building online docs, # which Qt Creator does. |