summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qcssparser.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-24 09:36:06 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-11-24 11:18:22 +0000
commit3966ab51ff140f173f1f0c23fa3a9ef985c73d27 (patch)
treef30302c2c40e8d1b30e3ab589917eca5883aa3a2 /src/gui/text/qcssparser.cpp
parent0861c2176c6dc1c69b733c1a843c2db5ec8ea786 (diff)
parent4783de0473a288fdff7e5354c12315ba025ec7e0 (diff)
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/gui/text/qcssparser.cpp')
-rw-r--r--src/gui/text/qcssparser.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index 31d832a9ce..a0438bd458 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -2211,6 +2211,7 @@ void Parser::init(const QString &css, bool isFile)
bool Parser::parse(StyleSheet *styleSheet, Qt::CaseSensitivity nameCaseSensitivity)
{
if (testTokenAndEndsWith(ATKEYWORD_SYM, QLatin1String("charset"))) {
+ while (test(S) || test(CDO) || test(CDC)) {}
if (!next(STRING)) return false;
if (!next(SEMICOLON)) return false;
}