Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build fix for the case when QT_NO_CSSPARSER is defined

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-02-24 21:18:32 +02:00
parent 6c3cd520e2
commit 19c8416447
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/painting/qcssutil.cpp
View file

@ -383,8 +383,6 @@ void qDrawBorder(QPainter *p, const QRect &br, const QCss::BorderStyle *styles,
} }
} }
#endif //QT_NO_CSSPARSER
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_NO_CSSPARSER

11
src/gui/text/qtexthtmlparser.cpp
View file

@ -611,7 +611,7 @@ void QTextHtmlParser::parseTag()
parser.parse(&sheet, Qt::CaseInsensitive); parser.parse(&sheet, Qt::CaseInsensitive);
inlineStyleSheets.append(sheet); inlineStyleSheets.append(sheet);
resolveStyleSheetImports(sheet); resolveStyleSheetImports(sheet);
#endif #endif // QT_NO_CSSPARSER
} }
parseCloseTag(); parseCloseTag();
return; return;
@ -1343,7 +1343,6 @@ void QTextHtmlParserNode::applyCssDeclarations(const QVector<QCss::Declaration>
} }
} }
} }
#endif // QT_NO_CSSPARSER #endif // QT_NO_CSSPARSER
void QTextHtmlParserNode::applyBackgroundImage(const QString &url, const QTextDocument *resourceProvider) 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; if (sheet.styleRules.count() != 1) return;
applyCssDeclarations(sheet.styleRules.at(0).declarations, resourceProvider); applyCssDeclarations(sheet.styleRules.at(0).declarations, resourceProvider);
} }
#endif #endif // QT_NO_CSSPARSER
QStringList QTextHtmlParser::parseAttributes() QStringList QTextHtmlParser::parseAttributes()
{ {
@ -1697,8 +1696,6 @@ QStringList QTextHtmlStyleSelector::nodeNames(NodePtr node) const
return QStringList(parser->at(node.id).tag.toLower()); return QStringList(parser->at(node.id).tag.toLower());
} }
#endif // QT_NO_CSSPARSER
static inline int findAttribute(const QStringList &attributes, const QString &name) static inline int findAttribute(const QStringList &attributes, const QString &name)
{ {
int idx = -1; int idx = -1;
@ -1708,8 +1705,6 @@ static inline int findAttribute(const QStringList &attributes, const QString &na
return idx; return idx;
} }
#ifndef QT_NO_CSSPARSER
QString QTextHtmlStyleSelector::attribute(NodePtr node, const QString &name) const QString QTextHtmlStyleSelector::attribute(NodePtr node, const QString &name) const
{ {
const QStringList &attributes = parser->at(node.id).attributes; const QStringList &attributes = parser->at(node.id).attributes;
@ -1836,9 +1831,9 @@ bool QTextHtmlParser::nodeIsChildOf(int i, QTextHTMLElements id) const
} }
return false; return false;
} }
#endif // QT_NO_CSSPARSER
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_NO_CSSPARSER
#endif // QT_NO_TEXTHTMLPARSER #endif // QT_NO_TEXTHTMLPARSER