Skip to content

Commit ca298bb

Browse files
committed
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>
1 parent b01f080 commit ca298bb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

libexec/syncqt.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ sub check_header {
363363
return if ($ignore_for_include_check{$header});
364364
if ($public_header) {
365365
$header_skip_qt_begin_namespace_test = $header &&
366-
($ignore_for_qt_begin_namespace_check{$header} || $header =~ m,(^|/)qt\w+global\.h$,);
366+
($ignore_for_qt_begin_namespace_check{$header} || $header =~ m,(^|/)q\w+global\.h$,);
367367
}
368368

369369
local $/ = "\x0a";

0 commit comments

Comments
 (0)