Windows QPA: Don't test for Desktop GL if Qt::AA_UseDesktopOpenGL is set

Pass the requested render to detectSupportedRenderers(), replacing
the bool glesOnly parameters. This allows for simplifying the code.

Fixes: QTBUG-70733
Change-Id: Iab65f62d24bf750019180e3b00e2d23c105e5997
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 05e2690009553d3faaf04ef8927fc072c652dd52)
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>

1 files changed, 2 insertions, 3 deletions

diff --git a/src/plugins/platforms/windows/qwindowsopengltester.h b/src/plugins/platforms/windows/qwindowsopengltester.h
index e3fec59dd5..d4b4b74195 100644
--- a/src/plugins/platforms/windows/qwindowsopengltester.h
+++ b/src/plugins/platforms/windows/qwindowsopengltester.h
@@ -89,11 +89,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();
 };