diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-12 08:37:40 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-09-12 08:48:05 +0000 |
commit | 307d0b32f08f159e7c3700d96d424d9725b5cc71 (patch) | |
tree | cd3df0204c4fb73ea2fa2f7a90da127d2df4e2b2 /mkspecs/features/qt_build_paths.prf | |
parent | 2d82cb7d779c2fa1fc54ecc7c98f66b125856dff (diff) | |
parent | 8e3dcd686b4637d6bfe95b0ca2c722bb1271c8c8 (diff) |
Merge "Merge remote-tracking branch 'origin/5.11.2' into 5.12" into refs/staging/5.12
Diffstat (limited to 'mkspecs/features/qt_build_paths.prf')
-rw-r--r-- | mkspecs/features/qt_build_paths.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf index 1848f00e90..3bb3823a8e 100644 --- a/mkspecs/features/qt_build_paths.prf +++ b/mkspecs/features/qt_build_paths.prf @@ -12,7 +12,8 @@ # Find the module's source root dir. isEmpty(_QMAKE_CONF_): error("Project has no top-level .qmake.conf file.") MODULE_BASE_INDIR = $$dirname(_QMAKE_CONF_) -MODULE_BASE_OUTDIR = $$shadowed($$MODULE_BASE_INDIR) +REAL_MODULE_BASE_OUTDIR = $$shadowed($$MODULE_BASE_INDIR) +MODULE_BASE_OUTDIR = $$REAL_MODULE_BASE_OUTDIR !isEmpty(MODULE_BASE_DIR): MODULE_SYNCQT_DIR = $$MODULE_BASE_DIR # compat for webkit isEmpty(MODULE_SYNCQT_DIR): MODULE_SYNCQT_DIR = $$MODULE_BASE_INDIR isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$MODULE_BASE_OUTDIR |