From 19c84164475a3c8e97c6c6f093c3e6fae10cfda3 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Thu, 24 Feb 2022 21:18:32 +0200
Subject: [PATCH] build fix for the case when QT_NO_CSSPARSER is defined

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 src/gui/painting/qcssutil.cpp    |  4 +---
 src/gui/text/qtexthtmlparser.cpp | 11 +++--------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/gui/painting/qcssutil.cpp b/src/gui/painting/qcssutil.cpp
index 8a6e84cd4..7042db8bc 100644
--- a/src/gui/painting/qcssutil.cpp
+++ b/src/gui/painting/qcssutil.cpp
@@ -383,8 +383,6 @@ void qDrawBorder(QPainter *p, const QRect &br, const QCss::BorderStyle *styles,
     }
 }
 
-#endif //QT_NO_CSSPARSER
-
 QT_END_NAMESPACE
 
-
+#endif // QT_NO_CSSPARSER
diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp
index 1687a2dc5..ec454f727 100644
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
@@ -611,7 +611,7 @@ void QTextHtmlParser::parseTag()
             parser.parse(&sheet, Qt::CaseInsensitive);
             inlineStyleSheets.append(sheet);
             resolveStyleSheetImports(sheet);
-#endif
+#endif // QT_NO_CSSPARSER
         }
         parseCloseTag();
         return;
@@ -1343,7 +1343,6 @@ void QTextHtmlParserNode::applyCssDeclarations(const QVector<QCss::Declaration>
         }
     }
 }
-
 #endif // QT_NO_CSSPARSER
 
 void QTextHtmlParserNode::applyBackgroundImage(const QString &url, const QTextDocument *resourceProvider)
@@ -1434,7 +1433,7 @@ void QTextHtmlParserNode::parseStyleAttribute(const QString &value, const QTextD
     if (sheet.styleRules.count() != 1) return;
     applyCssDeclarations(sheet.styleRules.at(0).declarations, resourceProvider);
 }
-#endif
+#endif // QT_NO_CSSPARSER
 
 QStringList QTextHtmlParser::parseAttributes()
 {
@@ -1697,8 +1696,6 @@ QStringList QTextHtmlStyleSelector::nodeNames(NodePtr node) const
     return QStringList(parser->at(node.id).tag.toLower());
 }
 
-#endif // QT_NO_CSSPARSER
-
 static inline int findAttribute(const QStringList &attributes, const QString &name)
 {
     int idx = -1;
@@ -1708,8 +1705,6 @@ static inline int findAttribute(const QStringList &attributes, const QString &na
     return idx;
 }
 
-#ifndef QT_NO_CSSPARSER
-
 QString QTextHtmlStyleSelector::attribute(NodePtr node, const QString &name) const
 {
     const QStringList &attributes = parser->at(node.id).attributes;
@@ -1836,9 +1831,9 @@ bool QTextHtmlParser::nodeIsChildOf(int i, QTextHTMLElements id) const
     }
     return false;
 }
+#endif // QT_NO_CSSPARSER
 
 QT_END_NAMESPACE
-#endif // QT_NO_CSSPARSER
 
 #endif // QT_NO_TEXTHTMLPARSER