Windows configure: Make dynamic opengl the default option

Most people expect dynamic opengl the default, when configuring Qt on Windows and are not too happy if they have to reconfigure and rebuild when they they find out, that the default is ANGLE. Dynamic OpenGL is the way to go as the user can easily decide what to use by setting the QT_OPENGL environment variable. Besides that, our packages are built using dynamic OpenGL on Windows [ChangeLog][configure] The default OpenGL configuration changed from ANGLE to dynamic OpenGL. Change-Id: Ia5688249e6d0a4d3ebe8cbe22e02fe290d9f0a4c Reviewed-by: Joerg Bornemann <[email protected]> Reviewed-by: Eirik Aavitsland <[email protected]>
wx984490083 · Feb 8, 2019 · 30178a2 · 30178a2
1 parent c1f4286
commit 30178a2
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/gui/configure.json b/src/gui/configure.json
@@ -1105,7 +1105,7 @@
         "angle": {
             "label": "ANGLE",
             "autoDetect": "features.opengles2 || features.opengl-dynamic",
-            "condition": "features.dxguid && tests.fxc && (features.direct3d9 || (config.winrt && features.direct3d11 && libs.d3dcompiler))",
+            "condition": "!features.opengl-desktop && features.dxguid && tests.fxc && (features.direct3d9 || (config.winrt && features.direct3d11 && libs.d3dcompiler))",
             "output": [
                 "publicFeature",
                 { "type": "define", "name": "QT_OPENGL_ES_2_ANGLE" },
@@ -1308,9 +1308,9 @@
         },
         "opengles2": {
             "label": "OpenGL ES 2.0",
-            "enable": "input.opengl == 'es2'",
+            "enable": "input.opengl == 'es2' || input.angle == 'yes'",
             "disable": "input.opengl == 'desktop' || input.opengl == 'dynamic' || input.opengl == 'no'",
-            "condition": "config.win32 || (!config.watchos && !features.opengl-desktop && libs.opengl_es2)",
+            "condition": "(config.win32 && !features.opengl-dynamic) || (!config.watchos && !features.opengl-desktop && libs.opengl_es2)",
             "output": [
                 "publicFeature",
                 "publicQtConfig",
@@ -1344,15 +1344,15 @@
         },
         "opengl-desktop": {
             "label": "Desktop OpenGL",
+            "autoDetect": "!config.win32",
             "enable": "input.opengl == 'desktop'",
             "disable": "input.opengl == 'es2' || input.opengl == 'dynamic' || input.opengl == 'no'",
             "condition": "(config.win32 && !config.winrt && !features.opengles2 && (config.msvc || libs.opengl))
                           || (!config.watchos && !config.win32 && !config.wasm && libs.opengl)"
         },
         "opengl-dynamic": {
             "label": "Dynamic OpenGL",
-            "enable": "input.opengl == 'dynamic'",
-            "autoDetect": false,
+            "disable": "input.angle == 'yes' || input.opengl == 'no' || input.opengl == 'desktop'",
             "condition": "config.win32 && !config.winrt",
             "output": [
                 { "type": "publicFeature", "name": "dynamicgl" },