diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-08-02 11:19:32 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-08-02 11:19:32 +0200 |
| commit | 2cfff0303fbab3fc9f9dd2b31132e2efce1e474f (patch) | |
| tree | 9bbe5b69a5f2bb8e66fa64d4525a2a1acfee5d90 /src/lib/corelib/parser | |
| parent | 923f98062b4297970f382da91256c21d47b01a5e (diff) | |
| parent | 94a097d95e9bfe485cebd7a5a9acd56301c54f04 (diff) | |
Merge 1.14 into master
Change-Id: Ib40a6fb77dfb1653910e802276571fc5dcea4d64
Diffstat (limited to 'src/lib/corelib/parser')
| -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) |