diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-10-23 22:19:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-29 22:21:32 +0100 |
| commit | 103ddce67a6d3863caa3ff4466cd8ea7d844a165 (patch) | |
| tree | b762a4fd786d639c934ff01b1d82842d11be7d76 /mkspecs/features/qt_build_paths.prf | |
| parent | 4a9ffb5c9ee3f2b307fd9dc794d1467ed03f9bdb (diff) | |
kill $$mod_component_base & $$mod_qmake_base
use $$MODULE_BASE_OUTDIR & $$MODULE_QMAKE_OUTDIR directly.
this is a no-op, except that now module pris will be built in qtbase for
all modules when building without -prefix - which is only consistent with
all other artifacts.
Change-Id: I2965b2c7a15aa9e82ba6017f5f4c0daa14b6e6fe
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs/features/qt_build_paths.prf')
| -rw-r--r-- | mkspecs/features/qt_build_paths.prf | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf index 75b83c0a5a..62a5a801f3 100644 --- a/mkspecs/features/qt_build_paths.prf +++ b/mkspecs/features/qt_build_paths.prf @@ -14,12 +14,8 @@ isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$MODULE_BASE_OUTDIR QTDIR = $$[QT_HOST_PREFIX] exists($$QTDIR/.qmake.cache) { - mod_component_base = $$QTDIR - mod_qmake_base = $$QTDIR -} else { - mod_component_base = $$MODULE_BASE_OUTDIR - mod_qmake_base = $$MODULE_QMAKE_OUTDIR + # Permit modules to enforce being built outside QTDIR ... + !force_independent: MODULE_BASE_OUTDIR = $$QTDIR + # ... though this sort of breaks the idea. + MODULE_QMAKE_OUTDIR = $$QTDIR } -# Permit modules to enforce being built outside QTDIR. -force_independent: mod_component_base = $$MODULE_BASE_OUTDIR - |