summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qt_configure.prf
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2019-04-15 12:41:52 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2019-04-23 09:09:33 +0000
commitc2917243a96d19c9cd49c827e63d40b7c0110d7d (patch)
treec6fc1542353bec751be372a5437f67ca5e907b96 /mkspecs/features/qt_configure.prf
parent6a21dc9d734fbde681dc4bf01d41561766a4359c (diff)
syncqt: Fix resolution of injected headers for external modules
Injected headers were made relative to MODULE_BASE_OUTDIR by syncqt and made absolute by resolving against REAL_MODULE_BASE_OUTDIR. This breaks for modules that reside outside the original Qt source tree (if the directory depth doesn't coincidentally match). Now, we resolve injected headers against build_basedir, which is REAL_MODULE_BASE_OUTDIR. To emphasize the equivalence of REAL_MODULE_BASE_OUTDIR and syncqt's build_basedir, use the former for syncqt's -output argument. This commit amends 2aa779e8. Fixes: QTBUG-70587 Change-Id: I2935d87d7ee681fa4aa795a270b94ab7a43abe59 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'mkspecs/features/qt_configure.prf')
0 files changed, 0 insertions, 0 deletions