diff options
author | Kai Köhne <kai.koehne@qt.io> | 2021-10-28 15:51:22 +0200 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2021-11-01 17:17:29 +0200 |
commit | ca298bbefc1f45ef51d6bd6c348e47b2708be881 (patch) | |
tree | 72598eabb9e8e91b373ea7740c1938e0d92bad9d /libexec | |
parent | b01f08033be1f83294e4ac9e49e17598e509a6f0 (diff) | |
download | qtbase-ca298bbefc1f45ef51d6bd6c348e47b2708be881.tar.gz |
Fix various configure time warnings about missing QT_BEGIN_NAMESPACE
We now have a couple of global.h headers that do only start with 'q'.
We can't change this anymore, so let's just accommodate for that.
This fixes the following warnings
qtserialport/src/serialport/qserialportglobal.h does not include QT_BEGIN_NAMESPACE
qtwebsockets/src/websockets/qwebsockets_global.h does not include QT_BEGIN_NAMESPACE
qtwebchannel/src/webchannel/qwebchannelglobal.h does not include QT_BEGIN_NAMESPACE
Pick-to: 6.2
Fixes: QTBUG-97831
Change-Id: I12aae13eb0d782d366cb84999392a544c30cdd79
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'libexec')
-rwxr-xr-x | libexec/syncqt.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libexec/syncqt.pl b/libexec/syncqt.pl index 2f69e14f83..593401bfe8 100755 --- a/libexec/syncqt.pl +++ b/libexec/syncqt.pl @@ -363,7 +363,7 @@ sub check_header { return if ($ignore_for_include_check{$header}); if ($public_header) { $header_skip_qt_begin_namespace_test = $header && - ($ignore_for_qt_begin_namespace_check{$header} || $header =~ m,(^|/)qt\w+global\.h$,); + ($ignore_for_qt_begin_namespace_check{$header} || $header =~ m,(^|/)q\w+global\.h$,); } local $/ = "\x0a"; |