diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 01:00:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 01:00:10 +0200 |
| commit | 0e1866017fd389629629b150ce252820592506cd (patch) | |
| tree | 681142ae0e610ef7af2a43ca2d62c3ea5ed5f91a /src/plugins/platforms/windows/qwindowsopengltester.h | |
| parent | 9567a34bc0d9be87d3b0d6cbcb841837ca1d5659 (diff) | |
| parent | 9a8175a13124e156948914854d2fda7436065b08 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6083c3e61b7dbe188f83676f7e7bb268e5ccf2f3
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsopengltester.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsopengltester.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/qwindowsopengltester.h b/src/plugins/platforms/windows/qwindowsopengltester.h index bec87c1f86..08628c2586 100644 --- a/src/plugins/platforms/windows/qwindowsopengltester.h +++ b/src/plugins/platforms/windows/qwindowsopengltester.h @@ -91,11 +91,10 @@ public: static Renderer requestedGlesRenderer(); static Renderer requestedRenderer(); - static Renderers supportedGlesRenderers(); - static Renderers supportedRenderers(); + static QWindowsOpenGLTester::Renderers supportedRenderers(Renderer requested); private: - static QWindowsOpenGLTester::Renderers detectSupportedRenderers(const GpuDescription &gpu, bool glesOnly); + static Renderers detectSupportedRenderers(const GpuDescription &gpu, Renderer requested); static bool testDesktopGL(); }; |