summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-03-01 21:08:51 +0100
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2016-03-02 11:06:39 +0000
commit3bcc303711ed930a96c98a500e9f0aa5ff403da5 (patch)
tree803557a23dcbbd334916bd109677aabc8da6aaad
parentae2d11df1092cc298d5b6c5e03a870df5feaf2be (diff)
fix non-git non-prefix shadow builds
turns out we need forwarding .pris in this case: without them, QT_MODULE_INCLUDE_BASE points into the build dir, so we fail to find the pre-generated headers. an alternative would be writing primary module .pris which already take that into account, but that would just add even more arcane code paths. Task-number: QTBUG-51521 Change-Id: I59f2a0d3f2095c9dfa0a8d1cabfc007a30bd2d23 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r--mkspecs/features/qt_module_pris.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
index 5f5639a1cf..8b717c98f4 100644
--- a/mkspecs/features/qt_module_pris.prf
+++ b/mkspecs/features/qt_module_pris.prf
@@ -10,7 +10,7 @@
#
load(qt_build_paths)
-force_independent|!isEmpty(MODULE_FWD_INCLUDES): \
+force_independent|split_incpath: \
CONFIG += need_fwd_pri
mod_work_pfx = $$MODULE_QMAKE_OUTDIR/mkspecs/modules
need_fwd_pri: \