Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: I6b1fe0c6c360a0d5285911869f0f4f93d86d822e

7 files changed, 32 insertions, 361 deletions

diff --git a/src/corelib/arch/qatomic_mips.h b/src/corelib/arch/qatomic_mips.h
deleted file mode 100644
index 8c400e0076..0000000000
--- a/src/corelib/arch/qatomic_mips.h
+++ /dev/null
@@ -1,351 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2011 Thiago Macieira <thiago@kde.org>
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QATOMIC_MIPS_H
-#define QATOMIC_MIPS_H
-
-#include <QtCore/qgenericatomic.h>
-
-QT_BEGIN_NAMESPACE
-
-#if 0
-// silence syncqt warnings
-QT_END_NAMESPACE
-#pragma qt_sync_skip_header_check
-#pragma qt_sync_stop_processing
-#endif
-
-#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE
-#define Q_ATOMIC_INT_TEST_AND_SET_IS_ALWAYS_NATIVE
-#define Q_ATOMIC_INT_FETCH_AND_STORE_IS_ALWAYS_NATIVE
-#define Q_ATOMIC_INT_FETCH_AND_ADD_IS_ALWAYS_NATIVE
-
-#define Q_ATOMIC_INT32_IS_SUPPORTED
-#define Q_ATOMIC_INT32_REFERENCE_COUNTING_IS_ALWAYS_NATIVE
-#define Q_ATOMIC_INT32_TEST_AND_SET_IS_ALWAYS_NATIVE
-#define Q_ATOMIC_INT32_FETCH_AND_STORE_IS_ALWAYS_NATIVE
-#define Q_ATOMIC_INT32_FETCH_AND_ADD_IS_ALWAYS_NATIVE
-
-#define Q_ATOMIC_POINTER_TEST_AND_SET_IS_ALWAYS_NATIVE
-#define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_ALWAYS_NATIVE
-#define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_ALWAYS_NATIVE
-
-template <int size> struct QBasicAtomicOps: QGenericAtomicOps<QBasicAtomicOps<size> >
-{
-    template <typename T>
-    static void acquireMemoryFence(const T &) Q_DECL_NOTHROW;
-    template <typename T>
-    static void releaseMemoryFence(const T &) Q_DECL_NOTHROW;
-    template <typename T>
-    static void orderedMemoryFence(const T &) Q_DECL_NOTHROW;
-
-    static inline Q_DECL_CONSTEXPR bool isReferenceCountingNative() Q_DECL_NOTHROW { return true; }
-    template <typename T> static bool ref(T &_q_value) Q_DECL_NOTHROW;
-    template <typename T> static bool deref(T &_q_value) Q_DECL_NOTHROW;
-
-    static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW { return true; }
-    static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return false; }
-    template <typename T> static bool
-    testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue = 0) Q_DECL_NOTHROW;
-
-    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() Q_DECL_NOTHROW { return true; }
-    template <typename T> static T fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW;
-
-    static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() Q_DECL_NOTHROW { return true; }
-    template <typename T> static
-    T fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW;
-};
-
-template <typename T> struct QAtomicOps : QBasicAtomicOps<sizeof(T)>
-{
-    typedef T Type;
-};
-
-#if defined(Q_CC_GNU)
-
-#if defined(_MIPS_ARCH_MIPS1) || (!defined(Q_CC_CLANG) && defined(__mips) && __mips - 0 == 1)
-# error "Sorry, the MIPS1 architecture is not supported"
-# error "please set '-march=' to your architecture (e.g., -march=mips32)"
-#endif
-
-template <int size> template <typename T> inline
-void QBasicAtomicOps<size>::acquireMemoryFence(const T &) Q_DECL_NOTHROW
-{
-    asm volatile (".set push\n"
-                  ".set mips32\n"
-                  "sync 0x11\n"
-                  ".set pop\n" ::: "memory");
-}
-
-template <int size> template <typename T> inline
-void QBasicAtomicOps<size>::releaseMemoryFence(const T &) Q_DECL_NOTHROW
-{
-    asm volatile (".set push\n"
-                  ".set mips32\n"
-                  "sync 0x12\n"
-                  ".set pop\n" ::: "memory");
-}
-
-template <int size> template <typename T> inline
-void QBasicAtomicOps<size>::orderedMemoryFence(const T &) Q_DECL_NOTHROW
-{
-    asm volatile (".set push\n"
-                  ".set mips32\n"
-                  "sync 0\n"
-                  ".set pop\n" ::: "memory");
-}
-
-template<> template<typename T> inline
-bool QBasicAtomicOps<4>::ref(T &_q_value) Q_DECL_NOTHROW
-{
-    T originalValue;
-    T newValue;
-    asm volatile("0:\n"
-                 "ll %[originalValue], %[_q_value]\n"
-                 "addiu %[newValue], %[originalValue], %[one]\n"
-                 "sc %[newValue], %[_q_value]\n"
-                 "beqz %[newValue], 0b\n"
-                 "nop\n"
-                 : [originalValue] "=&r" (originalValue),
-                   [_q_value] "+m" (_q_value),
-                   [newValue] "=&r" (newValue)
-                 : [one] "i" (1)
-                 : "cc", "memory");
-    return originalValue != T(-1);
-}
-
-template<> template<typename T> inline
-bool QBasicAtomicOps<4>::deref(T &_q_value) Q_DECL_NOTHROW
-{
-    T originalValue;
-    T newValue;
-    asm volatile("0:\n"
-                 "ll %[originalValue], %[_q_value]\n"
-                 "addiu %[newValue], %[originalValue], %[minusOne]\n"
-                 "sc %[newValue], %[_q_value]\n"
-                 "beqz %[newValue], 0b\n"
-                 "nop\n"
-                 : [originalValue] "=&r" (originalValue),
-                   [_q_value] "+m" (_q_value),
-                   [newValue] "=&r" (newValue)
-                 : [minusOne] "i" (-1)
-                 : "cc", "memory");
-    return originalValue != 1;
-}
-
-template<> template <typename T> inline
-bool QBasicAtomicOps<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW
-{
-    T result;
-    T tempValue;
-    asm volatile("0:\n"
-                 "ll %[tempValue], %[_q_value]\n"
-                 "xor %[result], %[tempValue], %[expectedValue]\n"
-                 "bnez %[result], 0f\n"
-                 "nop\n"
-                 "move %[tempValue], %[newValue]\n"
-                 "sc %[tempValue], %[_q_value]\n"
-                 "beqz %[tempValue], 0b\n"
-                 "nop\n"
-                 "0:\n"
-                 : [result] "=&r" (result),
-                   [tempValue] "=&r" (tempValue),
-                   [_q_value] "+m" (_q_value)
-                 : [expectedValue] "r" (expectedValue),
-                   [newValue] "r" (newValue)
-                 : "cc", "memory");
-    if (currentValue)
-        *currentValue = tempValue;
-    return result == 0;
-}
-
-template<> template <typename T> inline
-T QBasicAtomicOps<4>::fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW
-{
-    T originalValue;
-    T tempValue;
-    asm volatile("0:\n"
-                 "ll %[originalValue], %[_q_value]\n"
-                 "move %[tempValue], %[newValue]\n"
-                 "sc %[tempValue], %[_q_value]\n"
-                 "beqz %[tempValue], 0b\n"
-                 "nop\n"
-                 : [originalValue] "=&r" (originalValue),
-                   [tempValue] "=&r" (tempValue),
-                   [_q_value] "+m" (_q_value)
-                 : [newValue] "r" (newValue)
-                 : "cc", "memory");
-    return originalValue;
-}
-
-template<> template <typename T> inline
-T QBasicAtomicOps<4>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
-{
-    T originalValue;
-    T newValue;
-    asm volatile("0:\n"
-                 "ll %[originalValue], %[_q_value]\n"
-                 "addu %[newValue], %[originalValue], %[valueToAdd]\n"
-                 "sc %[newValue], %[_q_value]\n"
-                 "beqz %[newValue], 0b\n"
-                 "nop\n"
-                 : [originalValue] "=&r" (originalValue),
-                   [_q_value] "+m" (_q_value),
-                   [newValue] "=&r" (newValue)
-                 : [valueToAdd] "r" (valueToAdd * QAtomicAdditiveType<T>::AddScale)
-                 : "cc", "memory");
-    return originalValue;
-}
-
-#if defined(Q_PROCESSOR_MIPS_64)
-
-#define Q_ATOMIC_INT64_IS_SUPPORTED
-#define Q_ATOMIC_INT64_REFERENCE_COUNTING_IS_ALWAYS_NATIVE
-#define Q_ATOMIC_INT64_TEST_AND_SET_IS_ALWAYS_NATIVE
-#define Q_ATOMIC_INT64_FETCH_AND_STORE_IS_ALWAYS_NATIVE
-#define Q_ATOMIC_INT64_FETCH_AND_ADD_IS_ALWAYS_NATIVE
-
-template<> struct QAtomicOpsSupport<8> { enum { IsSupported = 1 }; };
-
-template<> template<typename T> inline
-bool QBasicAtomicOps<8>::ref(T &_q_value) Q_DECL_NOTHROW
-{
-    T originalValue;
-    T newValue;
-    asm volatile("0:\n"
-                 "lld %[originalValue], %[_q_value]\n"
-                 "addiu %[newValue], %[originalValue], %[one]\n"
-                 "scd %[newValue], %[_q_value]\n"
-                 "beqz %[newValue], 0b\n"
-                 "nop\n"
-                 : [originalValue] "=&r" (originalValue),
-                   [_q_value] "+m" (_q_value),
-                   [newValue] "=&r" (newValue)
-                 : [one] "i" (1)
-                 : "cc", "memory");
-    return originalValue != T(-1);
-}
-
-template<> template<typename T> inline
-bool QBasicAtomicOps<8>::deref(T &_q_value) Q_DECL_NOTHROW
-{
-    T originalValue;
-    T newValue;
-    asm volatile("0:\n"
-                 "lld %[originalValue], %[_q_value]\n"
-                 "addiu %[newValue], %[originalValue], %[minusOne]\n"
-                 "scd %[newValue], %[_q_value]\n"
-                 "beqz %[newValue], 0b\n"
-                 "nop\n"
-                 : [originalValue] "=&r" (originalValue),
-                   [_q_value] "+m" (_q_value),
-                   [newValue] "=&r" (newValue)
-                 : [minusOne] "i" (-1)
-                 : "cc", "memory");
-    return originalValue != 1;
-}
-
-template<> template <typename T> inline
-bool QBasicAtomicOps<8>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW
-{
-    T result;
-    T tempValue;
-    asm volatile("0:\n"
-                 "lld %[tempValue], %[_q_value]\n"
-                 "xor %[result], %[tempValue], %[expectedValue]\n"
-                 "bnez %[result], 0f\n"
-                 "nop\n"
-                 "move %[tempValue], %[newValue]\n"
-                 "scd %[tempValue], %[_q_value]\n"
-                 "beqz %[tempValue], 0b\n"
-                 "nop\n"
-                 "0:\n"
-                 : [result] "=&r" (result),
-                   [tempValue] "=&r" (tempValue),
-                   [_q_value] "+m" (_q_value)
-                 : [expectedValue] "r" (expectedValue),
-                   [newValue] "r" (newValue)
-                 : "cc", "memory");
-    if (currentValue)
-        *currentValue = tempValue;
-    return result == 0;
-}
-
-template<> template <typename T> inline
-T QBasicAtomicOps<8>::fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW
-{
-    T originalValue;
-    T tempValue;
-    asm volatile("0:\n"
-                 "lld %[originalValue], %[_q_value]\n"
-                 "move %[tempValue], %[newValue]\n"
-                 "scd %[tempValue], %[_q_value]\n"
-                 "beqz %[tempValue], 0b\n"
-                 "nop\n"
-                 : [originalValue] "=&r" (originalValue),
-                   [tempValue] "=&r" (tempValue),
-                   [_q_value] "+m" (_q_value)
-                 : [newValue] "r" (newValue)
-                 : "cc", "memory");
-    return originalValue;
-}
-
-template<> template <typename T> inline
-T QBasicAtomicOps<8>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
-{
-    T originalValue;
-    T newValue;
-    asm volatile("0:\n"
-                 "lld %[originalValue], %[_q_value]\n"
-                 "addu %[newValue], %[originalValue], %[valueToAdd]\n"
-                 "scd %[newValue], %[_q_value]\n"
-                 "beqz %[newValue], 0b\n"
-                 "nop\n"
-                 : [originalValue] "=&r" (originalValue),
-                   [_q_value] "+m" (_q_value),
-                   [newValue] "=&r" (newValue)
-                 : [valueToAdd] "r" (valueToAdd * QAtomicAdditiveType<T>::AddScale)
-                 : "cc", "memory");
-    return originalValue;
-}
-
-#endif // MIPS64
-
-#else
-# error "This compiler for MIPS is not supported"
-#endif // Q_CC_GNU
-
-QT_END_NAMESPACE
-
-#endif // QATOMIC_MIPS_H
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h
index a747134df3..c29b80d3d0 100644
--- a/src/corelib/thread/qbasicatomic.h
+++ b/src/corelib/thread/qbasicatomic.h
@@ -62,8 +62,6 @@
 # include "QtCore/qatomic_armv5.h"
 #elif defined(Q_PROCESSOR_IA64)
 #  include "QtCore/qatomic_ia64.h"
-#elif defined(Q_PROCESSOR_MIPS)
-#  include "QtCore/qatomic_mips.h"
 #elif defined(Q_PROCESSOR_X86)
 #  include <QtCore/qatomic_x86.h>
 
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index a69aae87f1..798002224a 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -4388,6 +4388,8 @@ QImage QImage::smoothScaled(int w, int h) const {
 
 static QImage rotated90(const QImage &image) {
     QImage out(image.height(), image.width(), image.format());
+    out.setDotsPerMeterX(image.dotsPerMeterY());
+    out.setDotsPerMeterY(image.dotsPerMeterX());
     if (image.colorCount() > 0)
         out.setColorTable(image.colorTable());
     int w = image.width();
@@ -4456,6 +4458,8 @@ static QImage rotated180(const QImage &image) {
 
 static QImage rotated270(const QImage &image) {
     QImage out(image.height(), image.width(), image.format());
+    out.setDotsPerMeterX(image.dotsPerMeterY());
+    out.setDotsPerMeterY(image.dotsPerMeterX());
     if (image.colorCount() > 0)
         out.setColorTable(image.colorTable());
     int w = image.width();
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 029f0f3425..4037310088 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -4700,9 +4700,11 @@ QFont QWidgetPrivate::naturalWidgetFont(uint inheritedMask) const
         if (QWidget *p = q->parentWidget()) {
             if (!p->testAttribute(Qt::WA_StyleSheet)) {
                 if (!naturalFont.isCopyOf(QApplication::font())) {
-                    QFont inheritedFont = p->font();
-                    inheritedFont.resolve(inheritedMask);
-                    naturalFont = inheritedFont.resolve(naturalFont);
+                    if (inheritedMask != 0) {
+                        QFont inheritedFont = p->font();
+                        inheritedFont.resolve(inheritedMask);
+                        naturalFont = inheritedFont.resolve(naturalFont);
+                    } // else nothing to do (naturalFont = naturalFont)
                 } else {
                     naturalFont = p->font();
                 }
@@ -4710,9 +4712,11 @@ QFont QWidgetPrivate::naturalWidgetFont(uint inheritedMask) const
         }
 #ifndef QT_NO_GRAPHICSVIEW
         else if (extra && extra->proxyWidget) {
-            QFont inheritedFont = extra->proxyWidget->font();
-            inheritedFont.resolve(inheritedMask);
-            naturalFont = inheritedFont.resolve(naturalFont);
+            if (inheritedMask != 0) {
+                QFont inheritedFont = extra->proxyWidget->font();
+                inheritedFont.resolve(inheritedMask);
+                naturalFont = inheritedFont.resolve(naturalFont);
+            } // else nothing to do (naturalFont = naturalFont)
         }
 #endif //QT_NO_GRAPHICSVIEW
     }
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index b368477a39..02c420e55c 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -896,7 +896,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     \value CE_ToolBoxTabLabel  The toolbox's tab label.
     \value CE_HeaderEmptyArea  The area of a header view where there are no header sections.
 
-    \value CE_ShapedFrame The frame with the shape specified in the QStyleOptionFrameV3; see QFrame.
+    \value CE_ShapedFrame The frame with the shape specified in the QStyleOptionFrame; see QFrame.
 
     \omitvalue CE_ColumnViewGrip
 
@@ -1034,7 +1034,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     \omitvalue SE_ViewItemCheckIndicator
 
     \value SE_FrameContents  Area for a frame's contents.
-    \value SE_ShapedFrameContents Area for a frame's contents using the shape in QStyleOptionFrameV3; see QFrame
+    \value SE_ShapedFrameContents Area for a frame's contents using the shape in QStyleOptionFrame; see QFrame
     \value SE_FrameLayoutItem  Area that counts for the parent layout.
 
     \value SE_HeaderArrow Area for the sort indicator for a header.
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index cab56e329e..d66dbec472 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -475,6 +475,7 @@ QStyleOptionFocusRect::QStyleOptionFocusRect(int version)
 /*!
     \typedef QStyleOptionFrameV2
     \relates QStyleOptionFrame
+    \obsolete
 
     Synonym for QStyleOptionFrame.
 */
@@ -482,6 +483,7 @@ QStyleOptionFocusRect::QStyleOptionFocusRect(int version)
 /*!
     \typedef QStyleOptionFrameV3
     \relates QStyleOptionFrame
+    \obsolete
 
     Synonym for QStyleOptionFrame.
 */
@@ -1253,6 +1255,7 @@ QStyleOptionToolBar::QStyleOptionToolBar(int version)
 /*!
     \typedef QStyleOptionTabV2
     \relates QStyleOptionTab
+    \obsolete
 
     Synonym for QStyleOptionTab.
 */
@@ -1260,6 +1263,7 @@ QStyleOptionToolBar::QStyleOptionToolBar(int version)
 /*!
     \typedef QStyleOptionTabV3
     \relates QStyleOptionTab
+    \obsolete
 
     Synonym for QStyleOptionTab.
 */
@@ -1497,6 +1501,7 @@ QStyleOptionTab::QStyleOptionTab(int version)
 /*!
     \typedef QStyleOptionProgressBarV2
     \relates QStyleOptionProgressBar
+    \obsolete
 
     Synonym for QStyleOptionProgressBar.
 */
@@ -2270,6 +2275,7 @@ QStyleOptionSpinBox::QStyleOptionSpinBox(int version)
 /*!
     \typedef QStyleOptionDockWidgetV2
     \relates QStyleOptionDockWidget
+    \obsolete
 
     Synonym for QStyleOptionDockWidget.
 */
@@ -2675,6 +2681,7 @@ QStyleOptionComboBox::QStyleOptionComboBox(int version)
 /*!
     \typedef QStyleOptionToolBoxV2
     \relates QStyleOptionToolBox
+    \obsolete
 
     Synonym for QStyleOptionToolBox.
 */
@@ -3012,6 +3019,7 @@ QStyleOptionTitleBar::QStyleOptionTitleBar(int version)
 /*!
     \typedef QStyleOptionViewItemV2
     \relates QStyleOptionViewItem
+    \obsolete
 
     Synonym for QStyleOptionViewItem.
 */
@@ -3019,6 +3027,7 @@ QStyleOptionTitleBar::QStyleOptionTitleBar(int version)
 /*!
     \typedef QStyleOptionViewItemV3
     \relates QStyleOptionViewItem
+    \obsolete
 
     Synonym for QStyleOptionViewItem.
 */
@@ -3026,6 +3035,7 @@ QStyleOptionTitleBar::QStyleOptionTitleBar(int version)
 /*!
     \typedef QStyleOptionViewItemV4
     \relates QStyleOptionViewItem
+    \obsolete
 
     Synonym for QStyleOptionViewItem.
 */
@@ -3298,6 +3308,7 @@ QStyleOptionViewItem::QStyleOptionViewItem(int version)
 /*!
     \typedef QStyleOptionTabWidgetFrameV2
     \relates QStyleOptionTabWidgetFrame
+    \obsolete
 
     Synonym for QStyleOptionTabWidgetFrame.
 */
@@ -3447,6 +3458,7 @@ QStyleOptionTabWidgetFrame::QStyleOptionTabWidgetFrame(int version)
 /*!
     \typedef QStyleOptionTabBarBaseV2
     \relates QStyleOptionTabBarBase
+    \obsolete
 
     Synonym for QStyleOptionTabBarBase.
 */
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