From 84438a77ccff294aa8b63dc6b5b11a58cdca0c12 Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Mon, 20 Feb 2012 09:43:02 +0100
Subject: Remove qMacVersion()

Add QSysInfo::macVersion() instead, to match the windowsVersion()
function.

Change-Id: I783e59583ca21653d25586156cbb0cb1f301868b
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/corelib/global/qglobal.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/corelib/global/qglobal.h')

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
-- 
cgit v1.2.3