diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-02-01 10:33:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-01 12:31:16 +0100 |
| commit | 256dc059eeea05878112e4cbb55d9a152d21fa1a (patch) | |
| tree | ac6b92ec5dd09f874d05f223ef9b274374d2bf1b /mkspecs/features/qt_build_paths.prf | |
| parent | f9725ce9c2d16474ca47ab6ac25f5df748b12ab5 (diff) | |
| parent | 6239af6f0f15871e02a516c97c5f1775743d352b (diff) | |
Merge "Merge branch 'release' into stable" into refs/staging/stable
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. |