diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2019-08-07 11:40:58 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-08-07 11:40:58 +0000 |
| commit | 52c5a37ea8c18f6c609e5beec696376c30d7b6db (patch) | |
| tree | d910f8fd7fee67e467d087a4a46367fa5d8b84b0 /src/lib/corelib/parser/qmljslexer.cpp | |
| parent | 456beb67e2e718d9b4674133d7d71c708e5cab94 (diff) | |
| parent | 2cfff0303fbab3fc9f9dd2b31132e2efce1e474f (diff) | |
Merge "Merge 1.14 into master"
Diffstat (limited to 'src/lib/corelib/parser/qmljslexer.cpp')
| -rw-r--r-- | src/lib/corelib/parser/qmljslexer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/parser/qmljslexer.cpp b/src/lib/corelib/parser/qmljslexer.cpp index ef57ab84a..dc6ac8a0f 100644 --- a/src/lib/corelib/parser/qmljslexer.cpp +++ b/src/lib/corelib/parser/qmljslexer.cpp @@ -73,7 +73,7 @@ static unsigned char convertHex(ushort c) static QChar convertHex(QChar c1, QChar c2) { - return {(convertHex(c1.unicode()) << 4) + convertHex(c2.unicode())}; + return QChar{(convertHex(c1.unicode()) << 4) + convertHex(c2.unicode())}; } static QChar convertUnicode(QChar c1, QChar c2, QChar c3, QChar c4) |