diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-09-28 12:48:09 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-10-18 08:26:54 +0000 |
| commit | a75d42eebee0a280d6f68255506b505649ce190d (patch) | |
| tree | 3d1ee6eefba278f079c79c6956cdc24f6f2c4157 /src/plugins/platforms/windows/qwin10helpers.cpp | |
| parent | cf7a97a6582303bd2659cbf60c085eb28a8a9894 (diff) | |
Windows QPA: Clean up code checking for the OS version
Use QOperatingSystemVersion for comparisons and remove
code for versions < Windows 7.
Change-Id: I5a5e3d08a29accd42f170da3ee9c9021ca499f82
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qwin10helpers.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwin10helpers.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwin10helpers.cpp b/src/plugins/platforms/windows/qwin10helpers.cpp index 12cccd124b..ac6a34d7c2 100644 --- a/src/plugins/platforms/windows/qwin10helpers.cpp +++ b/src/plugins/platforms/windows/qwin10helpers.cpp @@ -40,6 +40,7 @@ #include "qwin10helpers.h" #include <QtCore/QDebug> +#include <QtCore/QOperatingSystemVersion> #include <QtCore/private/qsystemlibrary_p.h> #if defined(Q_CC_MINGW) @@ -115,7 +116,7 @@ static QWindowsComBaseDLL baseComDll; bool QWindowsComBaseDLL::init() { - if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS10 && !isValid()) { + if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows10 && !isValid()) { QSystemLibrary library(QStringLiteral("combase")); roGetActivationFactory = reinterpret_cast<RoGetActivationFactory>(library.resolve("RoGetActivationFactory")); |