path: root/bin
diff options
authorOswald Buddenhagen <>2018-09-10 17:33:09 +0200
committerLiang Qi <>2018-09-12 06:53:02 +0000
commit2aa779e893bd7526c97a1968c6835204e4e985e2 (patch)
treecfa586d546f215baa425061a25e402a38a420ec4 /bin
parent9da5b6f7432dc1d87cec94040ede69cb2f7ff537 (diff)
syncqt: fix forwarding injected headers, take ~3
in non-prefix builds, the forwarding headers always end up in qtbase's build dir, while the injected headers always live in the build dir of the module they belong to. to deal with that, we now record the target path relative to the module root dir instead of relative to the base directory of the forwarding header itself. Fixes: QTBUG-70056 Change-Id: Ic4346148a125b13e2610f6965cdf4f5266ac763e Reviewed-by: Lars Knoll <>
Diffstat (limited to 'bin')
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/ b/bin/
index 8890b31770..77ce90c164 100755
--- a/bin/
+++ b/bin/
@@ -1111,7 +1111,7 @@ foreach my $lib (@modules_to_sync) {
elsif (!$shadow) {
$pri_install_pfiles.= "$pri_install_iheader ";;
- $pri_injections .= fixPaths($iheader, "$out_basedir/include/$lib")
+ $pri_injections .= fixPaths($iheader, $out_basedir)
.":".($no_stamp ? "^" : "").fixPaths($oheader, "$out_basedir/include/$lib")
.$injection." " if ($shadow);