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/qwindowsglcontext.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/qwindowsglcontext.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsglcontext.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp index 78368d87de..4bdf3167e4 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.cpp +++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp @@ -379,9 +379,7 @@ static PIXELFORMATDESCRIPTOR initPixelFormatDescriptor(&pfd); pfd.iPixelType = PFD_TYPE_RGBA; pfd.iLayerType = PFD_MAIN_PLANE; - pfd.dwFlags = PFD_SUPPORT_OPENGL; - if (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA) - pfd.dwFlags = PFD_SUPPORT_COMPOSITION; + pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_SUPPORT_COMPOSITION; const bool isPixmap = (additional.formatFlags & QWindowsGLRenderToPixmap) != 0; pfd.dwFlags |= isPixmap ? PFD_DRAW_TO_BITMAP : PFD_DRAW_TO_WINDOW; if (!(additional.formatFlags & QWindowsGLDirectRendering)) |