diff options
| -rw-r--r-- | doc/global/qt-cpp-defines.qdocconf | 3 | ||||
| -rw-r--r-- | src/tools/qdoc/tokenizer.cpp | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index 2e795e1439..06a6780a3d 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -14,7 +14,8 @@ defines += Q_QDOC \ QT_DEPRECATED_* \ Q_NO_USING_KEYWORD \ __cplusplus \ - Q_COMPILER_INITIALIZER_LISTS + Q_COMPILER_INITIALIZER_LISTS \ + Q_COMPILER_RVALUE_REFS Cpp.ignoretokens += \ PHONON_EXPORT \ diff --git a/src/tools/qdoc/tokenizer.cpp b/src/tools/qdoc/tokenizer.cpp index 224d451f4c..e1ca28eef8 100644 --- a/src/tools/qdoc/tokenizer.cpp +++ b/src/tools/qdoc/tokenizer.cpp @@ -237,7 +237,11 @@ int Tokenizer::getToken() return getTokenAfterPreprocessor(); case '&': yyCh = getChar(); - if (yyCh == '&' || yyCh == '=') { + /* + Removed check for '&&', only interpret '&=' as an operator. + '&&' is also used for an rvalue reference. QTBUG-32675 + */ + if (yyCh == '=') { yyCh = getChar(); return Tok_SomeOperator; } |