diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-29 13:04:00 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-07-06 15:17:15 +0200 |
| commit | 50b55b89f30d559bc262c0e81ef8a6beea39d183 (patch) | |
| tree | 80f37d73420d409100336a8831f6d5804fd147c8 /libexec | |
| parent | 1887c4ecc1426b1b32ace4b74503b469a2da9137 (diff) | |
Exclude 'global' headers from QT_BEGIN_NAMESPACE check in syncqt.pl
Add 'global' headers to the ignore list of the QT_BEGIN_NAMESPACE
check. The QT_BEGIN/END_NAMESPACE use in some of global header files
makes no sense. This will suppress warnings caused by migration to
the generated cpp exports.
Amends b10e4e846e7b1a7b4c9c7cb7b4ef1081e22f2354
Task-number: QTBUG-90492
Change-Id: Ic7e3f284263740021f86cade4dc19d810cb8fe02
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'libexec')
| -rwxr-xr-x | libexec/syncqt.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libexec/syncqt.pl b/libexec/syncqt.pl index c22cbfa8d0..f9ba844d1b 100755 --- a/libexec/syncqt.pl +++ b/libexec/syncqt.pl @@ -335,7 +335,8 @@ sub check_header { return if ($ignore_for_include_check{$header}); if ($public_header) { - $header_skip_qt_begin_namespace_test = 1 if ($ignore_for_qt_begin_namespace_check{$header}); + $header_skip_qt_begin_namespace_test = $header && + ($ignore_for_qt_begin_namespace_check{$header} || $header =~ /qt\w+global.h/); } local $/ = "\x0a"; |