From 9031069e12a9870c61de2fb7bfe3569f8c8859b0 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 10 Jan 2018 16:08:03 +0100 Subject: Add more Q_FALLTHROUGH() Silence g++ 7.X warnings. Change-Id: Id06d06e7e3b5be2cf3934d81f1891da58dea2649 Reviewed-by: Joerg Bornemann Reviewed-by: Edward Welbourne --- src/widgets/kernel/qapplication.cpp | 2 +- src/widgets/kernel/qopenglwidget.cpp | 2 +- src/widgets/kernel/qwidgetwindow.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/widgets/kernel') diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index e336c5f06d..9e4910ebd0 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -3057,7 +3057,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) case QEvent::MouseButtonRelease: case QEvent::MouseButtonDblClick: d->toolTipFallAsleep.stop(); - // fall-through + Q_FALLTHROUGH(); case QEvent::Leave: d->toolTipWakeUp.stop(); default: diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp index 07588d2ee2..c95be2dfe1 100644 --- a/src/widgets/kernel/qopenglwidget.cpp +++ b/src/widgets/kernel/qopenglwidget.cpp @@ -1429,7 +1429,7 @@ bool QOpenGLWidget::event(QEvent *e) d->reset(); if (isHidden()) break; - // FALLTHROUGH + Q_FALLTHROUGH(); case QEvent::Show: // reparenting may not lead to a resize so reinitalize on Show too if (d->initialized && window()->windowHandle() && d->context->shareContext() != QWidgetPrivate::get(window())->shareContext()) diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index d5a18b525b..1078652234 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -248,7 +248,7 @@ bool QWidgetWindow::event(QEvent *event) // are sent by QApplicationPrivate::notifyActiveWindowChange() case QEvent::FocusIn: handleFocusInEvent(static_cast(event)); - // Fallthrough + Q_FALLTHROUGH(); case QEvent::FocusOut: { #ifndef QT_NO_ACCESSIBILITY QAccessible::State state; -- cgit v1.2.3