diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-08 21:24:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-08 21:24:26 +0200 |
| commit | 4973786f0d36fc379c7e88a20c51639e93ddea2a (patch) | |
| tree | d4d0e3cc8adc4be3aeef13bffb6907154daf95fd /src/widgets | |
| parent | 0b17d2328592c03503c41af7d594e58233255ff5 (diff) | |
| parent | 00540a8345c35703aeaab072fd9e4727c9b61d5a (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I04f9f2749f68c0cb5a427b8d84e43b44bb143e4d
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/widgets/qtabbar.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index 02967e33c1..b2973bd8b3 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -2036,6 +2036,8 @@ void QTabBar::wheelEvent(QWheelEvent *event) int offset = event->delta() > 0 ? -1 : 1; d->setCurrentNextEnabledIndex(offset); QWidget::wheelEvent(event); +#else + Q_UNUSED(event) #endif } #endif //QT_NO_WHEELEVENT |