AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make %inject_headers a per-module config value

Browse Source 
it's module-specific.
on the way, fix it to actually support multiple files.

Change-Id: I796b0e98e38a54754022e0e2fa48cecb54d06ff4
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-04-11 14:13:01 +02:00
parent 61bcd838fa
commit 3c69bb8291
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/syncqt
View File

@ -808,7 +808,7 @@ our @ignore_for_include_check = ();
our @ignore_for_qt_begin_header_check = (); our @ignore_for_qt_begin_header_check = ();
our @ignore_for_qt_begin_namespace_check = (); our @ignore_for_qt_begin_namespace_check = ();
our @ignore_for_qt_module_check = (); our @ignore_for_qt_module_check = ();
my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir our %inject_headers = ();
# load the module's sync.profile here, before we can # load the module's sync.profile here, before we can
loadSyncProfile(\$basedir, \$out_basedir); loadSyncProfile(\$basedir, \$out_basedir);
@ -985,7 +985,7 @@ foreach my $lib (@modules_to_sync) {
foreach my $subdir (@subdirs) { foreach my $subdir (@subdirs) {
my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0); my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0);
if (defined $inject_headers{$subdir}) { if (defined $inject_headers{$subdir}) {
foreach my $if ($inject_headers{$subdir}) { foreach my $if (@{$inject_headers{$subdir}}) {
@headers = grep(!/^\Q$if\E$/, @headers); #in case we configure'd previously @headers = grep(!/^\Q$if\E$/, @headers); #in case we configure'd previously
push @headers, "*".$if; push @headers, "*".$if;
} }

1
sync.profile
View File

@ -145,6 +145,7 @@
@ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" ); @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" );
@ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" ); @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" );
@ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtTest}", "$modules{QtDBus}" ); @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtTest}", "$modules{QtDBus}" );
%inject_headers = ( "$basedir/src/corelib/global" => [ "qconfig.h" ] );
# Module dependencies. # Module dependencies.
# Every module that is required to build this module should have one entry. # Every module that is required to build this module should have one entry.
# Each of the module version specifiers can take one of the following values: # Each of the module version specifiers can take one of the following values: