diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-14 10:30:07 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-14 10:30:07 +0200 |
| commit | 6af8b5e791a1bd07d6a477c0a80694dc08eae367 (patch) | |
| tree | 6006f8b7ca3208f6704238f4681fb638390ee88a /mkspecs/features/qt_build_paths.prf | |
| parent | 49efea26a5fae8c2275999c36c7c8d24cf4125de (diff) | |
| parent | b0dce506cc91c4b623eb323db7bbc18469e721c2 (diff) | |
Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: I0c7b3f4e8e464f23252f28df98eba507127731f5
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 |