1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

syncqt: fix CamelCase aliases for injected headers

Browse Source 
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 <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Oswald Buddenhagen 2018-04-19 18:19:13 +02:00 committed by Jani Heikkinen
parent 967bb3f0d8
commit e46f9d68d8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/syncqt.pl
View File

@ -1086,7 +1086,7 @@ foreach my $lib (@modules_to_sync) {
# } # }
my $class_header = "$class "; my $class_header = "$class ";
$pri_install_gfiles .= $class_header $pri_install_gfiles .= $class_header
unless($pri_install_gfiles =~ $class_header); unless ($shadow || $pri_install_gfiles =~ $class_header);
$injection .= ":$class"; $injection .= ":$class";
} }

1
mkspecs/features/qt_module_headers.prf
View File

@ -149,6 +149,7 @@ for (injection, SYNCQT.INJECTIONS) {
write_file($$CLASS_FWD, CLASS_FWD_CONT)|error() write_file($$CLASS_FWD, CLASS_FWD_CONT)|error()
touch($$CLASS_FWD, $$MAIN_FWD) touch($$CLASS_FWD, $$MAIN_FWD)
!git_build: QMAKE_DISTCLEAN += $$CLASS_FWD !git_build: QMAKE_DISTCLEAN += $$CLASS_FWD
SYNCQT.INJECTED_HEADER_FILES += $$CLASS_FWD
} }
} }