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>

diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf
index 8b9cae5..8f8916a 100644 (file)
--- 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.

diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
index a2ad442..01605da 100644 (file)
--- 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