diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2016-10-06 18:58:23 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2017-01-15 08:09:24 +0000 |
commit | 0deca277d2d187a455b38d717578814be6f93231 (patch) | |
tree | 488db9109302584d86c1b55f471c479ff026aca8 | |
parent | 4baf08653c69fe5a131dae4ea27ac4cd67743f6e (diff) |
QtCore: fix GCC 7 warnings
GCC 7 warns about implicit fall-throughs now.
Fix by adding Q_FALLTHROUGH.
Change-Id: I482ab4c6adc469b11e1fd163516ff486b3b55ef7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 4 | ||||
-rw-r--r-- | src/corelib/tools/qdatetimeparser.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 433f595611..d7cdec9aac 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -2024,7 +2024,9 @@ void QStateMachinePrivate::processEvents(EventProcessingMode processingMode) if (QThread::currentThread() == q->thread()) { _q_process(); break; - } // fallthrough -- processing must be done in the machine thread + } + // processing must be done in the machine thread, so: + Q_FALLTHROUGH(); case QueuedProcessing: processingScheduled = true; QMetaObject::invokeMethod(q, "_q_process", Qt::QueuedConnection); diff --git a/src/corelib/tools/qdatetimeparser.cpp b/src/corelib/tools/qdatetimeparser.cpp index ae429950c8..65016933a0 100644 --- a/src/corelib/tools/qdatetimeparser.cpp +++ b/src/corelib/tools/qdatetimeparser.cpp @@ -1139,6 +1139,7 @@ end: } break; } } + Q_FALLTHROUGH(); case MonthSection: if (sn.count >= 3) { const int currentMonth = newCurrentValue.date().month(); |