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

syncqt: don't write INJECTED_*HEADERS

Browse Source 
these are actually redundant with INJECTIONS.

Change-Id: I0a71930401e00d30c9898b4d958de5e89c496d18
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 17:12:15 +02:00 committed by Jani Heikkinen
parent 8c57663ed2
commit 967bb3f0d8
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/syncqt.pl
View File

@ -922,9 +922,7 @@ foreach my $lib (@modules_to_sync) {
#information used after the syncing #information used after the syncing
my $pri_install_gfiles = ""; my $pri_install_gfiles = "";
my $pri_install_files = ""; my $pri_install_files = "";
my $pri_install_ifiles = "";
my $pri_install_pfiles = ""; my $pri_install_pfiles = "";
my $pri_install_ipfiles = "";
my $pri_install_qpafiles = ""; my $pri_install_qpafiles = "";
my $pri_injections = ""; my $pri_injections = "";
my $pri_clean_files = ""; my $pri_clean_files = "";
@ -1092,9 +1090,7 @@ foreach my $lib (@modules_to_sync) {
$injection .= ":$class"; $injection .= ":$class";
} }
if ($shadow) { if (!$shadow) {
$pri_install_ifiles .= "$pri_install_iheader ";
} else {
# put it into the master file # put it into the master file
$master_contents{$public_header} = $requires if (shouldMasterInclude($iheader)); $master_contents{$public_header} = $requires if (shouldMasterInclude($iheader));
@ -1106,10 +1102,7 @@ foreach my $lib (@modules_to_sync) {
elsif ($qpa_header) { elsif ($qpa_header) {
$pri_install_qpafiles.= "$pri_install_iheader ";; $pri_install_qpafiles.= "$pri_install_iheader ";;
} }
elsif ($shadow) { elsif (!$shadow) {
$pri_install_ipfiles .= "$pri_install_iheader ";
}
else {
$pri_install_pfiles.= "$pri_install_iheader ";; $pri_install_pfiles.= "$pri_install_iheader ";;
} }
$pri_injections .= fixPaths($iheader, "$out_basedir/include/$lib") $pri_injections .= fixPaths($iheader, "$out_basedir/include/$lib")
@ -1232,10 +1225,8 @@ foreach my $lib (@modules_to_sync) {
#handle the headers.pri for each module #handle the headers.pri for each module
my $headers_pri_contents = ""; my $headers_pri_contents = "";
$headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n"; $headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n";
$headers_pri_contents .= "SYNCQT.INJECTED_HEADER_FILES = $pri_install_ifiles\n";
$headers_pri_contents .= "SYNCQT.GENERATED_HEADER_FILES = $pri_install_gfiles\n"; $headers_pri_contents .= "SYNCQT.GENERATED_HEADER_FILES = $pri_install_gfiles\n";
$headers_pri_contents .= "SYNCQT.PRIVATE_HEADER_FILES = $pri_install_pfiles\n"; $headers_pri_contents .= "SYNCQT.PRIVATE_HEADER_FILES = $pri_install_pfiles\n";
$headers_pri_contents .= "SYNCQT.INJECTED_PRIVATE_HEADER_FILES = $pri_install_ipfiles\n";
$headers_pri_contents .= "SYNCQT.QPA_HEADER_FILES = $pri_install_qpafiles\n"; $headers_pri_contents .= "SYNCQT.QPA_HEADER_FILES = $pri_install_qpafiles\n";
$headers_pri_contents .= "SYNCQT.CLEAN_HEADER_FILES = $pri_clean_files\n"; $headers_pri_contents .= "SYNCQT.CLEAN_HEADER_FILES = $pri_clean_files\n";
$headers_pri_contents .= "SYNCQT.INJECTIONS = $pri_injections\n"; $headers_pri_contents .= "SYNCQT.INJECTIONS = $pri_injections\n";

8
mkspecs/features/qt_module_headers.prf
View File

@ -114,8 +114,6 @@ syncQtResolve(HEADER_FILES, $$_PRO_FILE_PWD_)
syncQtResolve(PRIVATE_HEADER_FILES, $$_PRO_FILE_PWD_) syncQtResolve(PRIVATE_HEADER_FILES, $$_PRO_FILE_PWD_)
syncQtResolve(QPA_HEADER_FILES, $$_PRO_FILE_PWD_) syncQtResolve(QPA_HEADER_FILES, $$_PRO_FILE_PWD_)
syncQtResolve(GENERATED_HEADER_FILES, $$INC_PATH/include/$$MODULE_INCNAME) syncQtResolve(GENERATED_HEADER_FILES, $$INC_PATH/include/$$MODULE_INCNAME)
syncQtResolve(INJECTED_HEADER_FILES, $$OUT_PWD)
syncQtResolve(INJECTED_PRIVATE_HEADER_FILES, $$OUT_PWD)
!lib_bundle: \ # Headers are embedded into the bundle, so don't install them separately. !lib_bundle: \ # Headers are embedded into the bundle, so don't install them separately.
CONFIG += qt_install_headers CONFIG += qt_install_headers
@ -128,8 +126,6 @@ exists($$OUT_PWD/qt$${MODULE}-config.h) {
SYNCQT.INJECTIONS += \ SYNCQT.INJECTIONS += \
$$fwd_rel/qt$${MODULE}-config.h:qt$${MODULE}-config.h \ $$fwd_rel/qt$${MODULE}-config.h:qt$${MODULE}-config.h \
$$fwd_rel/qt$${MODULE}-config_p.h:$$MODULE_VERSION/$$MODULE_INCNAME/private/qt$${MODULE}-config_p.h $$fwd_rel/qt$${MODULE}-config_p.h:$$MODULE_VERSION/$$MODULE_INCNAME/private/qt$${MODULE}-config_p.h
SYNCQT.INJECTED_HEADER_FILES += $$OUT_PWD/qt$${MODULE}-config.h
SYNCQT.INJECTED_PRIVATE_HEADER_FILES += $$OUT_PWD/qt$${MODULE}-config_p.h
} }
for (injection, SYNCQT.INJECTIONS) { for (injection, SYNCQT.INJECTIONS) {
@ -142,6 +138,10 @@ for (injection, SYNCQT.INJECTIONS) {
write_file($$MAIN_FWD, MAIN_FWD_CONT)|error() write_file($$MAIN_FWD, MAIN_FWD_CONT)|error()
equals(fwd_hdr, ofwd_hdr): touch($$MAIN_FWD, $$dst_hdr) equals(fwd_hdr, ofwd_hdr): touch($$MAIN_FWD, $$dst_hdr)
!git_build: QMAKE_DISTCLEAN += $$MAIN_FWD !git_build: QMAKE_DISTCLEAN += $$MAIN_FWD
!contains(ofwd_hdr, .*/private/.*): \
SYNCQT.INJECTED_HEADER_FILES += $$dst_hdr
else: \
SYNCQT.INJECTED_PRIVATE_HEADER_FILES += $$dst_hdr
injects = $$member(injects, 2, -1) injects = $$member(injects, 2, -1)
for (inject, injects) { for (inject, injects) {
CLASS_FWD = $$MODULE_INC_OUTDIR/$$inject CLASS_FWD = $$MODULE_INC_OUTDIR/$$inject