diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-28 20:25:33 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-31 15:51:35 +0100 |
| commit | f75e897519183f4c5503f5c4d1c0b7046dc9d81c (patch) | |
| tree | f1451eda66d81c4d308e5ce4cf3999a145a5cf43 /mkspecs/features/qt_build_paths.prf | |
| parent | 8f61befb532b1f9daf5a9aa7ab2bca5cdcdd9edb (diff) | |
centralize detection of prefix builds
this makes the use sites more expressive
Change-Id: Ib879de65d1cc26462fa61f5339e951f294515faf
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf index 123c87de3b..03b43e3153 100644 --- a/mkspecs/features/qt_build_paths.prf +++ b/mkspecs/features/qt_build_paths.prf @@ -16,8 +16,8 @@ isEmpty(MODULE_BASE_DIR): MODULE_BASE_DIR = $$MODULE_PROFILE_DIR isEmpty(MODULE_BASE_OUTDIR): MODULE_BASE_OUTDIR = $$shadowed($$MODULE_BASE_DIR) isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$MODULE_BASE_OUTDIR -QTDIR = $$[QT_HOST_PREFIX] -exists($$QTDIR/.qmake.cache) { +!prefix_build { + QTDIR = $$[QT_HOST_PREFIX] # Permit modules to enforce being built outside QTDIR ... !force_independent: MODULE_BASE_OUTDIR = $$QTDIR # ... though this sort of breaks the idea. |