From 8f940ca197249d89a4a6ff1958c8d4c95ff88077 Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Thu, 17 Apr 2025 08:23:36 +0300 Subject: [PATCH] Fix namespace build when cssparser is disabled The QT_BEGIN_NAMESPACE was inside "#if TEXTHTMLPARSER" code block, whereas the QT_END_NAMESPACE was inside a nested "#if CSSPARSER" block. Therefore if cssparser was disabled, the file will effectively have just QT_BEGIN_NAMESPACE, and the build will fail (if it's an actual namespace build). Pick-to: 6.9 6.8 Change-Id: Ibd750a71c154cb9596a7227327b7d5b3ab307001 Reviewed-by: Ivan Solovev --- src/gui/text/qtexthtmlparser.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp index 383a3129d56..72afbcda6f7 100644 --- a/src/gui/text/qtexthtmlparser.cpp +++ b/src/gui/text/qtexthtmlparser.cpp @@ -2275,7 +2275,8 @@ bool QTextHtmlParser::nodeIsChildOf(int i, QTextHTMLElements id) const return false; } -QT_END_NAMESPACE #endif // QT_NO_CSSPARSER +QT_END_NAMESPACE + #endif // QT_NO_TEXTHTMLPARSER