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

Change-Id: I6b1fe0c6c360a0d5285911869f0f4f93d86d822e

4 files changed, 28 insertions, 8 deletions

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