From e46f9d68d8a8cc75c011fb304f064b927a784d56 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 Apr 2018 18:19:13 +0200 Subject: syncqt: fix CamelCase aliases for injected headers don't put them into GENERATED_HEADER_FILES, as they obviously cannot be found in a pre-synced source dir. instead, let the injection code itself add them to INJECTED_HEADER_FILES. Task-number: QTBUG-67813 Change-Id: Id2a7c565b14fcba8aba9d1dd8b1dd39c586d0d91 Reviewed-by: Joerg Bornemann Reviewed-by: Alexandru Croitor --- bin/syncqt.pl | 2 +- mkspecs/features/qt_module_headers.prf | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/syncqt.pl b/bin/syncqt.pl index 3616db6f4b..f202599fe0 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -1086,7 +1086,7 @@ foreach my $lib (@modules_to_sync) { # } my $class_header = "$class "; $pri_install_gfiles .= $class_header - unless($pri_install_gfiles =~ $class_header); + unless ($shadow || $pri_install_gfiles =~ $class_header); $injection .= ":$class"; } diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index 7d97fb083a..e45ac94966 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -149,6 +149,7 @@ for (injection, SYNCQT.INJECTIONS) { write_file($$CLASS_FWD, CLASS_FWD_CONT)|error() touch($$CLASS_FWD, $$MAIN_FWD) !git_build: QMAKE_DISTCLEAN += $$CLASS_FWD + SYNCQT.INJECTED_HEADER_FILES += $$CLASS_FWD } } -- cgit v1.2.3