diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-20 09:43:02 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-21 12:48:04 +0100 |
| commit | 84438a77ccff294aa8b63dc6b5b11a58cdca0c12 (patch) | |
| tree | 34bc78874aad68cf19b8d618097316b7933c63d8 /src/corelib/global | |
| parent | 69da8588d41bbf5ab785f5ad7c1fce76deefc7d0 (diff) | |
Remove qMacVersion()
Add QSysInfo::macVersion() instead, to match the windowsVersion()
function.
Change-Id: I783e59583ca21653d25586156cbb0cb1f301868b
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 20 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 5 |
2 files changed, 10 insertions, 15 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 |