diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-25 07:21:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-25 07:21:53 +0200 |
| commit | e28e91ae99b8c3859899e04cc9370534c7c7b86d (patch) | |
| tree | cca81b1e745be4f25aab78e8e917c2324594e539 /src/gui/text/qcssparser.cpp | |
| parent | 5ea233ca6782eb27adf596515cb66ef3dadc1d5e (diff) | |
| parent | ebfad73b4e44fe6db8059200da105b4b87888718 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/corelib/animation/qpropertyanimation.cpp
src/gui/image/qicon.cpp
tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
Change-Id: I3698172b7b44ebb487cb38f50fd2c4a9f8a35b21
Diffstat (limited to 'src/gui/text/qcssparser.cpp')
| -rw-r--r-- | src/gui/text/qcssparser.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp index 1c454b0fca..8e317d5b97 100644 --- a/src/gui/text/qcssparser.cpp +++ b/src/gui/text/qcssparser.cpp @@ -2742,8 +2742,10 @@ bool Parser::parseFunction(QString *name, QString *args) { *name = lexem(); name->chop(1); + // until(RPAREN) needs FUNCTION token at index-1 to work properly + int start = index; skipSpace(); - const int start = index; + std::swap(start, index); if (!until(RPAREN)) return false; for (int i = start; i < index - 1; ++i) args->append(symbols.at(i).lexem()); |