summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-11 14:13:01 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-19 16:40:05 +0200
commit3c69bb8291bd77817f0c195486156d3e3b5aa360 (patch)
tree783f40fba4c916fa515a67337c48c2099abfe18e /bin
parent61bcd838fafa5a5856fcae2023464b5f2999d398 (diff)
make %inject_headers a per-module config value
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>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/syncqt4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/syncqt b/bin/syncqt
index 849c22f70a..d6fef1d804 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -808,7 +808,7 @@ our @ignore_for_include_check = ();
our @ignore_for_qt_begin_header_check = ();
our @ignore_for_qt_begin_namespace_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
loadSyncProfile(\$basedir, \$out_basedir);
@@ -985,7 +985,7 @@ foreach my $lib (@modules_to_sync) {
foreach my $subdir (@subdirs) {
my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0);
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
push @headers, "*".$if;
}