1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix namespace build when cssparser is disabled

Browse Source 
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 <ivan.solovev@qt.io>
This commit is contained in:
Juha Vuolle 2025-04-17 08:23:36 +03:00
parent 2e6032188f
commit 8f940ca197
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/text/qtexthtmlparser.cpp
View File

@ -2275,7 +2275,8 @@ bool QTextHtmlParser::nodeIsChildOf(int i, QTextHTMLElements id) const
return false; return false;
} }
QT_END_NAMESPACE
#endif // QT_NO_CSSPARSER #endif // QT_NO_CSSPARSER
QT_END_NAMESPACE
#endif // QT_NO_TEXTHTMLPARSER #endif // QT_NO_TEXTHTMLPARSER