diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:07:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-08 10:50:04 +0200 |
| commit | 01e4919d2a89a61a588c9dc05f30acb26701207d (patch) | |
| tree | 6a318ca543de2923a8264f305c81bd725c94a3eb /src/qdoc/cppcodeparser.cpp | |
| parent | 36defe5725bbed8e03d4f0ef676bc6afa99e6b04 (diff) | |
| parent | 80c135154c1e78c7af7d6d54129e009bc6015c33 (diff) | |
| download | qttools-01e4919d2a89a61a588c9dc05f30acb26701207d.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/windeployqt/main.cpp
Change-Id: I2256565a75b8e1c63ef5aeb34fecb6929f94a1f1
Diffstat (limited to 'src/qdoc/cppcodeparser.cpp')
| -rw-r--r-- | src/qdoc/cppcodeparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index b67520600..a819026d8 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -1431,8 +1431,8 @@ bool CppCodeParser::matchFunctionDecl(Aggregate *parent, matched_static = true; break; case Tok_QT_DEPRECATED: - // no break here. matched_QT_DEPRECATED = true; + Q_FALLTHROUGH(); // no break here. case Tok_QT_COMPAT: matched_compat = true; break; |