diff options
Diffstat (limited to 'src/corelib/global/qoperatingsystemversion_p.h')
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion_p.h | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/src/corelib/global/qoperatingsystemversion_p.h b/src/corelib/global/qoperatingsystemversion_p.h index 77f19d27c5..6922f4ad54 100644 --- a/src/corelib/global/qoperatingsystemversion_p.h +++ b/src/corelib/global/qoperatingsystemversion_p.h @@ -53,26 +53,15 @@ #include "qoperatingsystemversion.h" +#ifdef Q_OS_WIN +#include <qt_windows.h> +#endif + QT_BEGIN_NAMESPACE -static inline QOperatingSystemVersion::OSType currentType() -{ -#if defined(Q_OS_WIN) - return QOperatingSystemVersion::Windows; -#elif defined(Q_OS_MACOS) - return QOperatingSystemVersion::MacOS; -#elif defined(Q_OS_IOS) - return QOperatingSystemVersion::IOS; -#elif defined(Q_OS_TVOS) - return QOperatingSystemVersion::TvOS; -#elif defined(Q_OS_WATCHOS) - return QOperatingSystemVersion::WatchOS; -#elif defined(Q_OS_ANDROID) - return QOperatingSystemVersion::Android; -#else - return QOperatingSystemVersion::Unknown; +#ifdef Q_OS_WIN +OSVERSIONINFOEX qWindowsVersionInfo(); #endif -} QT_END_NAMESPACE |