diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 157898953e2..1d57ce73283 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -535,7 +535,7 @@ qt_feature("mtdev" PRIVATE ) qt_feature("opengles2" PUBLIC LABEL "OpenGL ES 2.0" - CONDITION WIN32 OR ( NOT APPLE_WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND ) + CONDITION NOT WIN32 AND ( NOT APPLE_WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND ) ENABLE INPUT_opengl STREQUAL 'es2' DISABLE INPUT_opengl STREQUAL 'desktop' OR INPUT_opengl STREQUAL 'dynamic' OR INPUT_opengl STREQUAL 'no' ) diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index eb3fd606fe1..4cbcc981ce8 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -726,6 +726,9 @@ def parseFeature(ctx, feature, data, cm_fh): 'msvc_mp': None, 'optimize_debug': None, 'optimize_size': None, + 'opengles2': { # special case to disable implicit feature on WIN32, until ANGLE is ported + 'condition': 'NOT WIN32 AND ( NOT APPLE_WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND )' + }, 'pkg-config': None, 'posix_fallocate': None, # Only needed for sqlite, which we do not want to build 'posix-libiconv': {