diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:14:01 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:14:16 +0100 |
| commit | 17dc773221c402308ddf15bcdb622b00ab7a95c3 (patch) | |
| tree | 2e0b5a076b6b51e5fb77aec0ce379227ef681f3d /src/widgets/widgets | |
| parent | 99d061ffd5ea9fc52d96b92cdf3dce93685b4205 (diff) | |
| parent | 9daef8a54c32162a50b0f558dac829333165618f (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I6b1fe0c6c360a0d5285911869f0f4f93d86d822e
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index aab28bf18a..ed3af90532 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -3242,6 +3242,9 @@ void QComboBox::keyReleaseEvent(QKeyEvent *e) #ifndef QT_NO_WHEELEVENT void QComboBox::wheelEvent(QWheelEvent *e) { +#ifdef Q_OS_DARWIN + Q_UNUSED(e); +#else Q_D(QComboBox); if (!d->viewContainer()->isVisible()) { int newIndex = currentIndex(); @@ -3262,6 +3265,7 @@ void QComboBox::wheelEvent(QWheelEvent *e) } e->accept(); } +#endif } #endif |