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 <[email protected]> Reviewed-by: Alexandru Croitor <[email protected]>
ClassAteam · Apr 25, 2018 · e46f9d6 · e46f9d6
1 parent 967bb3f
commit e46f9d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/bin/syncqt.pl b/bin/syncqt.pl
@@ -1086,7 +1086,7 @@ ($$)
 #                                   }
                                     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
@@ -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
     }
 }