diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-08 20:26:23 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-26 18:18:46 +0100 |
| commit | 9d20f4b6291e9c7cfb493eded15d984ac2a15b49 (patch) | |
| tree | da980d056567236b11f2f280e42bc88833c04bf7 /bin | |
| parent | 5544208e2286f29cc113d268df3923f0f2a3fbee (diff) | |
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>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/syncqt | 20 |
1 files changed, 0 insertions, 20 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) { |