diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-29 15:01:42 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-29 23:23:02 +0200 |
| commit | e3361c161449122112266f34e2afffc03b10558f (patch) | |
| tree | b8d0cf6a0b6e2014496511b8682be7f7eafe700c /util | |
| parent | a97a8fcc1a9b832fee2ed0e01258e1664a3e3e69 (diff) | |
CMake: Update src\gui\configure.json and the conversion script
The ANGLE removal's manual configure.cmake changes are now replaced
by updating the conversion script's special cases instead.
Change-Id: I06317fe0202b25bd9f9524da14e1bb0ccbb30cc1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 7 | ||||
| -rw-r--r-- | util/cmake/helper.py | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 7f7a103ef6..11bb01a17a 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -884,13 +884,6 @@ def get_feature_mapping(): "msvc_mp": None, "optimize_debug": None, "optimize_size": None, - # special case to enable implicit feature on WIN32, until ANGLE is ported - "opengl-desktop": {"autoDetect": ""}, - # special case to disable implicit feature on WIN32, until ANGLE is ported - "opengl-dynamic": {"autoDetect": "OFF"}, - "opengles2": { # special case to disable implicit feature on WIN32, until ANGLE is ported - "condition": "NOT WIN32 AND ( NOT WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND )" - }, "simulator_and_device": {"condition": "UIKIT AND NOT QT_UIKIT_SDK"}, "pkg-config": {"condition": "PKG_CONFIG_FOUND"}, "posix-libiconv": { diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 83d19ba2f5..c9a71bf036 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -431,7 +431,7 @@ _library_map = [ LibraryMapping("mysql", "MySQL", "MySQL::MySQL"), LibraryMapping("odbc", "ODBC", "ODBC::ODBC"), LibraryMapping("opengl_es2", "GLESv2", "GLESv2::GLESv2"), - LibraryMapping("opengl", "OpenGL", "OpenGL::GL", resultVariable="OpenGL_OpenGL"), + LibraryMapping("opengl", "OpenGL", "OpenGL::GL", resultVariable="OpenGL"), LibraryMapping( "openssl_headers", "WrapOpenSSLHeaders", |