diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-03 14:19:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-16 18:34:06 +0200 |
| commit | 311fe0e811f0f0f23cd3b3fac7ae919a65baadc6 (patch) | |
| tree | 97d82df13d04e4b75317d96213a88f676ca131b9 /mkspecs | |
| parent | 1329a5778364f966cf6c42ca4fb3ff9c09f39a2f (diff) | |
remove support for forwarding module pri creation via syncqt
now that all modules have migrated, this dead code can be removed.
Change-Id: I5e9c7dd3fb271346d1b5f0e2930874da3e4d2d57
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/default_pre.prf | 26 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_fwdpri.prf | 8 |
2 files changed, 11 insertions, 23 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 64052205e4..2a729663be 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -2,31 +2,27 @@ load(exclusive_builds) CONFIG = lex yacc warn_on debug exceptions $$CONFIG !build_pass:exists($$_PRO_FILE_PWD_/sync.profile) { - # If the install directory is a build directory, we tell syncqt to do a -developer-build. - QTDIR = $$[QT_HOST_DATA] - exists($$QTDIR/.qmake.cache) { - QTFWD = -module-fwd $$QTDIR/mkspecs/modules -developer-build - } else { - isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$OUT_PWD - modpath = $$MODULE_QMAKE_OUTDIR/mkspecs/modules - QTFWD = -module-fwd $$modpath - !isEmpty(_QMAKE_SUPER_CACHE_):!contains(QMAKEMODULES, $$modpath): \ - cache(QMAKEMODULES, add super, modpath) - unset(modpath) + !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) + } } qtPrepareTool(QMAKE_SYNCQT, syncqt) - isEmpty(MODULE_BASE_OUTDIR): MODULE_BASE_OUTDIR = $$OUT_PWD - MSG = $$quote($$QMAKE_SYNCQT -qtdir $$[QT_HOST_DATA/get] $$QTFWD -outdir $$MODULE_BASE_OUTDIR $$_PRO_FILE_PWD_) + MSG = $$quote($$QMAKE_SYNCQT -qtdir $$[QT_HOST_DATA/get] -outdir $$MODULE_BASE_OUTDIR $$_PRO_FILE_PWD_) !silent:message($$MSG) system($$MSG) { # success! Nothing to do } else { error("Failed to run: $$MSG") } - - unset(QTFWD) } # Populate the installdir which will be passed to qdoc in the default_post.prf diff --git a/mkspecs/features/qt_module_fwdpri.prf b/mkspecs/features/qt_module_fwdpri.prf index 9de255fc91..9a5abd77a8 100644 --- a/mkspecs/features/qt_module_fwdpri.prf +++ b/mkspecs/features/qt_module_fwdpri.prf @@ -11,12 +11,6 @@ # Permit modules to enforce being built outside QTDIR. force_independent: mod_component_base = $$MODULE_BASE_OUTDIR - # This check will be removed soon. Weird indentation to avoid reindenting the code later. - syncprofile = $$cat($$MODULE_PROFILE_DIR/sync.profile, lines) - contains(syncprofile, "^%modulepris.*") { - MODULE_FWD_PRI = $$mod_qmake_base/mkspecs/modules/$$replace(MODULE_PRI, ^.*/,) - } else { - MODULE_FWD_PRI = $$mod_qmake_base/mkspecs/modules/qt_$${MODULE}.pri # Create a forwarding module .pri file @@ -31,8 +25,6 @@ write_file($$MODULE_FWD_PRI, MODULE_FWD_PRI_CONT)|error("Aborting.") touch($$MODULE_FWD_PRI, $$MODULE_PRI) - } # create forwarding module pris - # Then, inject the new module into the current cache state !contains(QMAKE_INTERNAL_INCLUDED_FILES, $$MODULE_PRI) { # before the actual include()! added = $$MODULE_PRI $$MODULE_FWD_PRI |