diff options
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 - |