diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-24 09:09:01 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 10:31:21 +0100 |
| commit | 4783de0473a288fdff7e5354c12315ba025ec7e0 (patch) | |
| tree | 1dbd12129b4677c5a02307c1046fdb8cff056324 /src/gui/text/qcssparser.cpp | |
| parent | 60054b5940b19f4dd9780e63da1e2dce45baf131 (diff) | |
| parent | 38c1057f696c4e3f168305091413428d99007c43 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/network/socket/qnativesocketengine_winrt.cpp
tools/configure/configureapp.cpp
tools/configure/environment.cpp
Change-Id: Ieae6f2ee004a87f041751852b687484f91ee4480
Diffstat (limited to 'src/gui/text/qcssparser.cpp')
| -rw-r--r-- | src/gui/text/qcssparser.cpp | 1 |
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; } |