1 files changed, 8 insertions, 12 deletions
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index 3e73abc62c..3666bce205 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -38,11 +38,9 @@
 ****************************************************************************/
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
+#include "private/qstylehelper_p.h"
 #include "qstyleoption.h"
 #include "qapplication.h"
-#if QT_CONFIG(style_mac)
-# include "qmacstyle_mac_p.h"
-#endif
 #include <qdebug.h>
 #include <QtCore/qmath.h>
 
@@ -205,18 +203,16 @@ void QStyleOption::init(const QWidget *widget)
     if (!(state & QStyle::State_Active) && !qt_mac_can_clickThrough(widget))
         state &= ~QStyle::State_Enabled;
 #endif
-#if QT_CONFIG(style_mac)
-    switch (QMacStyle::widgetSizePolicy(widget)) {
-    case QMacStyle::SizeSmall:
+    switch (QStyleHelper::widgetSizePolicy(widget)) {
+    case QStyleHelper::SizeSmall:
         state |= QStyle::State_Small;
         break;
-    case QMacStyle::SizeMini:
+    case QStyleHelper::SizeMini:
         state |= QStyle::State_Mini;
         break;
     default:
         ;
     }
-#endif
 #ifdef QT_KEYPAD_NAVIGATION
     if (widget->hasEditFocus())
         state |= QStyle::State_HasEditFocus;
@@ -3269,7 +3265,7 @@ QStyleOptionViewItem::QStyleOptionViewItem(int version)
 
 #endif // QT_CONFIG(itemviews)
 /*!
-    \fn T qstyleoption_cast<T>(const QStyleOption *option)
+    \fn template <typename T> T qstyleoption_cast<T>(const QStyleOption *option)
     \relates QStyleOption
 
     Returns a T or 0 depending on the \l{QStyleOption::type}{type} and
@@ -3283,7 +3279,7 @@ QStyleOptionViewItem::QStyleOptionViewItem(int version)
 */
 
 /*!
-    \fn T qstyleoption_cast<T>(QStyleOption *option)
+    \fn template <typename T> T qstyleoption_cast<T>(QStyleOption *option)
     \overload
     \relates QStyleOption
 
@@ -4005,7 +4001,7 @@ QStyleHintReturnVariant::~QStyleHintReturnVariant()
 */
 
 /*!
-    \fn T qstyleoption_cast<T>(const QStyleHintReturn *hint)
+    \fn template <typename T> T qstyleoption_cast<T>(const QStyleHintReturn *hint)
     \relates QStyleHintReturn
 
     Returns a T or 0 depending on the \l{QStyleHintReturn::type}{type}
@@ -4019,7 +4015,7 @@ QStyleHintReturnVariant::~QStyleHintReturnVariant()
 */
 
 /*!
-    \fn T qstyleoption_cast<T>(QStyleHintReturn *hint)
+    \fn template <typename T> T qstyleoption_cast<T>(QStyleHintReturn *hint)
     \overload
     \relates QStyleHintReturn