diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-10 16:08:03 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-12 07:10:25 +0000 |
| commit | 9031069e12a9870c61de2fb7bfe3569f8c8859b0 (patch) | |
| tree | 5964cdd7cd106ca81be94424cdefc99769d9564f /src/widgets/widgets/qcombobox.cpp | |
| parent | cf7a4016a17615df2952389bae11149a49b151bc (diff) | |
Add more Q_FALLTHROUGH()
Silence g++ 7.X warnings.
Change-Id: Id06d06e7e3b5be2cf3934d81f1891da58dea2649
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/widgets/widgets/qcombobox.cpp')
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 4e8668b001..7d4498af5b 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -3215,7 +3215,7 @@ void QComboBox::keyPressEvent(QKeyEvent *e) case Qt::Key_Up: if (e->modifiers() & Qt::ControlModifier) break; // pass to line edit for auto completion - // fall through + Q_FALLTHROUGH(); case Qt::Key_PageUp: #ifdef QT_KEYPAD_NAVIGATION if (QApplication::keypadNavigationEnabled()) @@ -3303,7 +3303,7 @@ void QComboBox::keyPressEvent(QKeyEvent *e) switch (move) { case MoveFirst: newIndex = -1; - // fall through + Q_FALLTHROUGH(); case MoveDown: newIndex++; while (newIndex < rowCount && !(d->model->index(newIndex, d->modelColumn, d->root).flags() & Qt::ItemIsEnabled)) @@ -3311,7 +3311,7 @@ void QComboBox::keyPressEvent(QKeyEvent *e) break; case MoveLast: newIndex = rowCount; - // fall through + Q_FALLTHROUGH(); case MoveUp: newIndex--; while ((newIndex >= 0) && !(d->model->flags(d->model->index(newIndex,d->modelColumn,d->root)) & Qt::ItemIsEnabled)) |