diff options
author | Liang Qi <liang.qi@qt.io> | 2017-04-07 08:31:13 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-04-07 09:38:34 +0000 |
commit | 191a21047863cd327d3e8102b08dbf20a4c6e0a5 (patch) | |
tree | 9be92e3111992951d87571ebbcf1e2859901050f /src/widgets/widgets/qtoolbar.cpp | |
parent | dea78262e52da38de47301e206459967aa6719bb (diff) | |
parent | 5d6073be27cb951b692bbcc4dc0dd54cc09c9fd4 (diff) |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/widgets/qtoolbar.cpp')
-rw-r--r-- | src/widgets/widgets/qtoolbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp index 2a0912df0a..48fa88b7a0 100644 --- a/src/widgets/widgets/qtoolbar.cpp +++ b/src/widgets/widgets/qtoolbar.cpp @@ -1143,7 +1143,7 @@ bool QToolBar::event(QEvent *event) case QEvent::Hide: if (!isHidden()) break; - // fallthrough intended + Q_FALLTHROUGH(); case QEvent::Show: d->toggleViewAction->setChecked(event->type() == QEvent::Show); #ifdef Q_OS_OSX |