diff options
author | Jake Petroules <jake.petroules@petroules.com> | 2014-06-13 18:59:30 -0400 |
---|---|---|
committer | Jake Petroules <jake.petroules@petroules.com> | 2014-09-12 22:01:58 +0200 |
commit | 4e8720d413ceca288408ae34bc726f768ca467c6 (patch) | |
tree | a3386a6e1d2df84434d02d07d14f4a8bd2037251 /src/corelib/kernel/qcore_mac_p.h | |
parent | fac71528cce279282d66b0a96ddd8570d567955f (diff) |
Use new, supported APIs in OS X 10.10 and iOS 8.0 to get the OS version.
Gestalt is deprecated so we can't use it long term. At the same time,
the new API is cross platform, so we'll no longer have to parse strings
in -[UIDevice systemVersion] either.
Change-Id: Ic81797174c1a3d50b47b9b209205a6a506cc75ef
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'src/corelib/kernel/qcore_mac_p.h')
-rw-r--r-- | src/corelib/kernel/qcore_mac_p.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index e92a2d2978..4df300e72f 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -143,9 +143,11 @@ private: QString string; }; -#ifdef Q_OS_IOS -QSysInfo::MacVersion qt_ios_version(); -#endif +typedef struct { + int major, minor, patch; +} QAppleOperatingSystemVersion; + +QAppleOperatingSystemVersion qt_apple_os_version(); QT_END_NAMESPACE |