syncqt: Don't check for QT_{BEGIN,END}_HEADER macros

The QT_{BEGIN,END}_HEADER macros have never worked and
might be potentially removed.

Also removing the list of blacklisted files from sync.profile

Change-Id: I601969cf8eddf3908c3ad46f63af9434670d4046
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

2 files changed, 0 insertions, 21 deletions

diff --git a/bin/syncqt b/bin/syncqt
index c6e22aa63f..88f7135775 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -777,7 +777,6 @@ my $class_lib_map_contents = "";
 our @ignore_headers = ();
 our @ignore_for_master_contents = ();
 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 = ();
 our %inject_headers = ();
@@ -1143,7 +1142,6 @@ if($check_includes) {
             foreach my $subdir (@subdirs) {
                 my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0);
                 foreach my $header (@headers) {
-                    my $header_skip_qt_begin_header_test = 0;
                     my $header_skip_qt_begin_namespace_test = 0;
                     $header = 0 if($header =~ /^ui_.*.h/);
                     foreach (@ignore_headers) {
@@ -1163,9 +1161,6 @@ if($check_includes) {
                                 foreach (@ignore_for_include_check) {
                                     $public_header = 0 if($header eq $_);
                                 }
-                                foreach(@ignore_for_qt_begin_header_check) {
-                                    $header_skip_qt_begin_header_test = 1 if ($header eq $_);
-                                }
                                 foreach(@ignore_for_qt_begin_namespace_check) {
                                     $header_skip_qt_begin_namespace_test = 1 if ($header eq $_);
                                 }
@@ -1175,8 +1170,6 @@ if($check_includes) {
                         my $iheader = $subdir . "/" . $header;
                         if($public_header) {
                             if(open(F, "<$iheader")) {
-                                my $qt_begin_header_found = 0;
-                                my $qt_end_header_found = 0;
                                 my $qt_begin_namespace_found = 0;
                                 my $qt_end_namespace_found = 0;
                                 my $line;
@@ -1203,25 +1196,12 @@ if($check_includes) {
                                                 }
                                             }
                                         }
-                                    } elsif ($header_skip_qt_begin_header_test == 0 and $line =~ /^QT_BEGIN_HEADER\s*$/) {
-                                        $qt_begin_header_found = 1;
-                                    } elsif ($header_skip_qt_begin_header_test == 0 and $line =~ /^QT_END_HEADER\s*$/) {
-                                        $qt_end_header_found = 1;
                                     } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_BEGIN_NAMESPACE\s*$/) {
                                         $qt_begin_namespace_found = 1;
                                     } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_END_NAMESPACE\s*$/) {
                                         $qt_end_namespace_found = 1;
                                     }
                                 }
-                                if ($header_skip_qt_begin_header_test == 0 and $stop_processing  == 0) {
-                                    if ($qt_begin_header_found == 0) {
-                                        print "$lib: WARNING: $iheader does not include QT_BEGIN_HEADER\n";
-                                    }
-
-                                    if ($qt_begin_header_found && $qt_end_header_found == 0) {
-                                        print "$lib: WARNING: $iheader has QT_BEGIN_HEADER but no QT_END_HEADER\n";
-                                    }
-                                }
 
                                 if ($header_skip_qt_begin_namespace_test == 0 and $stop_processing  == 0) {
                                     if ($qt_begin_namespace_found == 0) {
diff --git a/sync.profile b/sync.profile
index 756f83e409..779a1992ca 100644
--- a/sync.profile
+++ b/sync.profile
@@ -59,7 +59,6 @@ my @zlib_headers = ( "zconf.h", "zlib.h" );
 my @harfbuzz_headers = ( "harfbuzz-buffer-private.h", "harfbuzz-buffer.h", "harfbuzz-dump.h", "harfbuzz-external.h", "harfbuzz-gdef-private.h", "harfbuzz-gdef.h", "harfbuzz-global.h", "harfbuzz-gpos-private.h", "harfbuzz-gpos.h", "harfbuzz-gsub-private.h", "harfbuzz-gsub.h", "harfbuzz-impl.h", "harfbuzz-open-private.h", "harfbuzz-open.h", "harfbuzz-shape.h", "harfbuzz-shaper-private.h", "harfbuzz-shaper.h", "harfbuzz-stream-private.h", "harfbuzz-stream.h", "harfbuzz.h" );
 @ignore_headers = ( @internal_zlib_headers );
 @ignore_for_include_check = ( "qsystemdetection.h", "qcompilerdetection.h", "qprocessordetection.h", @zlib_headers, @angle_headers, @harfbuzz_headers);
-@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", @zlib_headers, @angle_headers, @harfbuzz_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, @harfbuzz_headers);
 %inject_headers = ( "$basedir/src/corelib/global" => [ "qconfig.h" ] );
 # Module dependencies.