diff options
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 152 |
1 files changed, 7 insertions, 145 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 3a3f579446..f770ee7729 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -9,8 +9,6 @@ "commandline": { "options": { "accessibility": "boolean", - "angle": "boolean", - "combined-angle-lib": "boolean", "direct2d": "boolean", "directfb": "boolean", "directwrite": "boolean", @@ -64,61 +62,6 @@ { "type": "makeSpec", "spec": "BCM_HOST" } ] }, - "dxguid": { - "label": "DirectX GUID", - "sources": [ - "-ldxguid" - ] - }, - "dxgi": { - "label": "DirectX GI", - "headers": "dxgi.h", - "sources": [ - "-ldxgi" - ] - }, - "dxgi1_2": { - "label": "DirectX GI 1.2", - "test": { - "main": [ - "// fails with mingw-w64 5.4.0 - declaration is missing from header", - "IDXGISurface1 *surface;", - "(void) surface;" - ] - }, - "headers": "dxgi1_2.h", - "sources": [ - "-ldxgi" - ] - }, - "d3d9": { - "label": "Direct3D 9", - "headers": "d3d9.h", - "sources": [ - "-ld3d9" - ] - }, - "d3d11": { - "label": "Direct3D 11", - "headers": "d3d11.h", - "sources": [ - "-ld3d11" - ] - }, - "d3d11_1": { - "label": "Direct3D 11.1", - "headers": "d3d11_1.h", - "sources": [ - "-ld3d11" - ] - }, - "d3dcompiler": { - "label": "Direct3D Shader Compiler Library", - "headers": "d3dcompiler.h", - "sources": [ - "-ld3dcompiler" - ] - }, "d2d1": { "label": "Direct2D 1", "headers": [ "d2d1.h", "d2d1helper.h" ], @@ -793,22 +736,6 @@ }, "tests": { - "angle_d3d11_qdtd": { - "label": "D3D11_QUERY_DATA_TIMESTAMP_DISJOINT", - "type": "compile", - "test": { - "include": "d3d11.h", - "main": [ - "D3D11_QUERY_DATA_TIMESTAMP_DISJOINT qdtd;", - "(void) qdtd;" - ] - } - }, - "fxc": { - "label": "Direct3D Shader Compiler", - "type": "fxc", - "log": "value" - }, "drm_atomic": { "label": "DRM Atomic API", "type": "compile", @@ -1109,26 +1036,6 @@ "condition": "features.accessibility && features.xcb && features.dbus && libs.atspi", "output": [ "privateFeature", "feature" ] }, - "angle": { - "label": "ANGLE", - "autoDetect": "features.opengles2 || features.opengl-dynamic", - "condition": "!features.opengl-desktop && features.dxguid && tests.fxc && (features.direct3d9 || (config.winrt && features.direct3d11 && libs.d3dcompiler))", - "output": [ - "publicFeature", - { "type": "varAssign", "name": "QMAKE_FXC_LOCATION", "value": "tests.fxc.value" } - ] - }, - "angle_d3d11_qdtd": { - "label": "D3D11_QUERY_DATA_TIMESTAMP_DISJOINT", - "condition": "features.angle && tests.angle_d3d11_qdtd", - "output": [ "privateFeature" ] - }, - "combined-angle-lib": { - "label": "Combined ANGLE Library", - "autoDetect": false, - "condition": "features.angle", - "output": [ "publicFeature" ] - }, "directfb": { "label": "DirectFB", "section": "Platform plugins", @@ -1160,39 +1067,9 @@ "condition": "features.directwrite1 && libs.dwrite_2", "output": [ "privateFeature" ] }, - "dxguid": { - "label": "DirectX GUID", - "condition": "config.win32 && libs.dxguid", - "output": [ "privateFeature" ] - }, - "direct3d9": { - "label": "Direct 3D 9", - "condition": "config.win32 && !config.winrt && libs.d3d9", - "output": [ "privateFeature" ] - }, - "dxgi": { - "label": "DirectX GI", - "condition": "config.win32 && libs.dxgi", - "output": [ "privateFeature" ] - }, - "dxgi1_2": { - "label": "DirectX GI 1.2", - "condition": "features.dxgi && libs.dxgi1_2", - "output": [ "privateFeature" ] - }, - "direct3d11": { - "label": "Direct 3D 11", - "condition": "features.dxgi && libs.d3d11", - "output": [ "privateFeature" ] - }, - "direct3d11_1": { - "label": "Direct 3D 11.1", - "condition": "features.direct3d11 && features.dxgi1_2 && libs.d3d11_1", - "output": [ "privateFeature" ] - }, "direct2d": { "label": "Direct 2D", - "condition": "config.win32 && !config.winrt && features.direct3d11 && libs.d2d1", + "condition": "config.win32 && !config.winrt && libs.d2d1", "output": [ "privateFeature" ] }, "direct2d1_1": { @@ -1313,9 +1190,9 @@ }, "opengles2": { "label": "OpenGL ES 2.0", - "enable": "input.opengl == 'es2' || input.angle == 'yes'", + "enable": "input.opengl == 'es2'", "disable": "input.opengl == 'desktop' || input.opengl == 'dynamic' || input.opengl == 'no'", - "condition": "(config.win32 && !features.opengl-dynamic) || (!config.watchos && !features.opengl-desktop && libs.opengl_es2)", + "condition": "!config.win32 && !config.watchos && !features.opengl-desktop && libs.opengl_es2", "output": [ "publicFeature", "publicQtConfig" @@ -1323,7 +1200,7 @@ }, "opengles3": { "label": "OpenGL ES 3.0", - "condition": "features.opengles2 && !features.angle && tests.opengles3", + "condition": "features.opengles2 && tests.opengles3", "output": [ "publicFeature" ] @@ -1347,11 +1224,11 @@ "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)" + "condition": "(config.win32 && !config.winrt && (config.msvc || libs.opengl)) || (!config.watchos && !config.win32 && !config.wasm && libs.opengl)" }, "opengl-dynamic": { "label": "Dynamic OpenGL", - "disable": "input.angle == 'yes' || input.opengl == 'no' || input.opengl == 'desktop'", + "disable": "input.opengl == 'no' || input.opengl == 'desktop'", "condition": "config.win32 && !config.winrt", "output": [ { "type": "publicFeature", "name": "dynamicgl" }, @@ -1380,7 +1257,7 @@ }, "egl": { "label": "EGL", - "condition": "(features.opengl || features.openvg) && (features.angle || libs.egl) && (features.dlopen || !config.unix || config.integrity)", + "condition": "(features.opengl || features.openvg) && libs.egl && (features.dlopen || !config.unix || config.integrity)", "output": [ "privateFeature", "feature" ] }, "egl_x11": { @@ -1869,11 +1746,6 @@ }, { "type": "warning", - "condition": "config.win32 && (features.opengles2 || features.opengl-dynamic) && !features.angle", - "message": "Using OpenGL ES 2.0 on Windows without ANGLE. The build will most likely fail. Specify -opengl desktop to use regular OpenGL." - }, - { - "type": "warning", "condition": "config.darwin && features.system-harfbuzz", "message": "On OS X, AAT is supported only with -qt-harfbuzz." }, @@ -1916,16 +1788,6 @@ { "section": "OpenGL", "entries": [ - { - "type": "feature", - "args": "angle", - "condition": "config.win32" - }, - { - "type": "feature", - "args": "combined-angle-lib", - "condition": "features.angle" - }, "opengl-desktop", { "type": "feature", |