3 files changed, 11 insertions, 16 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index eea4397dcd..6257376b62 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -819,15 +819,6 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn int qMacVersion()
-    \relates <QtGlobal>
-
-    Use QSysInfo::MacintoshVersion instead.
-
-    \sa QSysInfo
-*/
-
-/*!
     \macro QT_VERSION_CHECK
     \relates <QtGlobal>
 
@@ -949,6 +940,13 @@ bool qSharedBuild()
 */
 
 /*!
+    \fn QSysInfo::MacVersion QSysInfo::macVersion()
+
+    Returns the version of Mac OS X on which the application is run (Mac OS X
+    Only).
+*/
+
+/*!
     \enum QSysInfo::Endian
 
     \value BigEndian  Big-endian byte order (also called Network byte order)
@@ -1630,7 +1628,7 @@ Q_CORE_EXPORT QString qt_mac_from_pascal_string(const Str255 pstr) {
 
 #if defined(Q_OS_MAC)
 
-static QSysInfo::MacVersion macVersion()
+QSysInfo::MacVersion QSysInfo::macVersion()
 {
 #ifndef QT_NO_CORESERVICES
     SInt32 gestalt_version;
@@ -1640,7 +1638,7 @@ static QSysInfo::MacVersion macVersion()
 #endif
     return QSysInfo::MV_Unknown;
 }
-const QSysInfo::MacVersion QSysInfo::MacintoshVersion = macVersion();
+const QSysInfo::MacVersion QSysInfo::MacintoshVersion = QSysInfo::macVersion();
 
 #elif defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) || defined(Q_OS_WINCE)
 
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index d4d2ffdabb..b7ff27018e 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -941,16 +941,13 @@ public:
         MV_LION = MV_10_7
     };
     static const MacVersion MacintoshVersion;
+    static MacVersion macVersion();
 #endif
 };
 
 Q_CORE_EXPORT const char *qVersion();
 Q_CORE_EXPORT bool qSharedBuild();
 
-#if defined(Q_OS_MAC)
-inline int qMacVersion() { return QSysInfo::MacintoshVersion; }
-#endif
-
 #ifndef Q_OUTOFLINE_TEMPLATE
 #  define Q_OUTOFLINE_TEMPLATE
 #endif
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index 09cb9cc016..1f91fa4d00 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -5092,7 +5092,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
                 uint sc = SC_TitleBarMinButton;
                 ThemeTitleBarWidget tbw = kThemeWidgetCollapseBox;
                 bool active = titlebar->state & State_Active;
-                if (qMacVersion() < QSysInfo::MV_10_6) {
+                if (QSysInfo::macVersion() < QSysInfo::MV_10_6) {
                     int border = 2;
                     titleBarRect.origin.x += border;
                     titleBarRect.origin.y -= border;