diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-13 11:54:03 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-05-13 16:37:15 +0000 |
| commit | ffdcad9e400ff43b7f33621caca672389a03e4e6 (patch) | |
| tree | 5c4d35573902a1794870a2a6bc14aa20b8c800f3 /src/tools/moc/preprocessor.cpp | |
| parent | 98cb9275d064d8b996dcd78324c4249f69a981a9 (diff) | |
| parent | f8212b87d9b9474eaba2493662ef6c2d2e7a4376 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
Diffstat (limited to 'src/tools/moc/preprocessor.cpp')
| -rw-r--r-- | src/tools/moc/preprocessor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp index e83125925d9..d135bddb4c6 100644 --- a/src/tools/moc/preprocessor.cpp +++ b/src/tools/moc/preprocessor.cpp @@ -241,7 +241,8 @@ Symbols Preprocessor::tokenize(const QByteArray& input, int lineNum, Preprocesso if (!*data || *data != '.') { token = INTEGER_LITERAL; if (data - lexem == 1 && - (*data == 'x' || *data == 'X') + (*data == 'x' || *data == 'X' + || *data == 'b' || *data == 'B') && *lexem == '0') { ++data; while (is_hex_char(*data) || *data == '\'') |