diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-15 11:32:06 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-18 17:11:06 +0000 |
commit | 19877a05078d76e2de33bb0072a86cf08335787e (patch) | |
tree | b80b5f4d31fe3feed4a53e09e2ba6c006f26e4c5 | |
parent | a5bb91c2b81388e7c84548a7aed44257f5662776 (diff) |
automatically exclude generated headers from syncqt checks
Change-Id: I349a132745165f8873eda351e86bf15c90156aaf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rwxr-xr-x | bin/syncqt.pl | 4 | ||||
-rw-r--r-- | sync.profile | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/bin/syncqt.pl b/bin/syncqt.pl index 633068287e..7410762985 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -879,6 +879,10 @@ loadSyncProfile(\$basedir, \$out_basedir); @modules_to_sync = keys(%modules) if($#modules_to_sync == -1); +for my $p (keys %inject_headers) { + push @ignore_for_include_check, @{$inject_headers{$p}}; +} + my %allmoduleheadersprivate = map { $_ => 1 } @allmoduleheadersprivate; %ignore_for_include_check = map { $_ => 1 } @ignore_for_include_check; %ignore_for_qt_begin_namespace_check = map { $_ => 1 } @ignore_for_qt_begin_namespace_check; diff --git a/sync.profile b/sync.profile index 1d1c08fc0f..276cbeafe1 100644 --- a/sync.profile +++ b/sync.profile @@ -64,7 +64,7 @@ my @internal_zlib_headers = ( "crc32.h", "deflate.h", "gzguts.h", "inffast.h", " my @zlib_headers = ( "zconf.h", "zlib.h" ); @ignore_headers = ( @internal_zlib_headers ); @ignore_for_include_check = ( "qsystemdetection.h", "qcompilerdetection.h", "qprocessordetection.h", @zlib_headers, @angle_headers); -@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", @zlib_headers, @angle_headers); +@ignore_for_qt_begin_namespace_check = ( "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h", @zlib_headers, @angle_headers); %inject_headers = ( "$basedir/src/corelib/global" => [ "qconfig.h", "qfeatures.h" ] ); # Module dependencies. # Every module that is required to build this module should have one entry. |