diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-04-14 13:48:28 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-04-17 11:50:24 +0200 |
| commit | ad5aee2e34fad45d1d90bb059fa00a791d4ba3e2 (patch) | |
| tree | 0df5be078e937caf0cec39b312449128300735dc /src/gui/configure.cmake | |
| parent | 009d583eef20e7732225cdeae32925ac676d3a47 (diff) | |
Get rid of QT_OPENGL_ES*
The QT_OPENGL_ES* macros are leftovers from an earlier,
ad hoc configuration system, which has since been
replaced by QT_CONFIG. To clean things up in Qt 6,
we use the new way instead.
Task-number: QTBUG-83467
Change-Id: I578dc7695bff9d5ee303b22e44f60fee22fe0c28
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui/configure.cmake')
| -rw-r--r-- | src/gui/configure.cmake | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index fde2c9a29e..4354fea8bb 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -541,7 +541,6 @@ qt_feature("angle" PUBLIC AUTODETECT QT_FEATURE_opengles2 OR QT_FEATURE_opengl_dynamic CONDITION NOT QT_FEATURE_opengl_desktop AND QT_FEATURE_dxguid AND tests.fxc AND ( QT_FEATURE_direct3d9 OR ( WINRT AND QT_FEATURE_direct3d11 AND libs.d3dcompiler ) ) OR FIXME ) -qt_feature_definition("angle" "QT_OPENGL_ES_2_ANGLE") qt_feature("angle_d3d11_qdtd" PRIVATE LABEL "D3D11_QUERY_DATA_TIMESTAMP_DISJOINT" CONDITION QT_FEATURE_angle AND TEST_angle_d3d11_qdtd @@ -710,24 +709,19 @@ qt_feature("opengles2" PUBLIC ENABLE INPUT_opengl STREQUAL 'es2' OR INPUT_angle STREQUAL 'yes' DISABLE INPUT_opengl STREQUAL 'desktop' OR INPUT_opengl STREQUAL 'dynamic' OR INPUT_opengl STREQUAL 'no' ) -qt_feature_definition("opengles2" "QT_OPENGL_ES") -qt_feature_definition("opengles2" "QT_OPENGL_ES_2") qt_feature_config("opengles2" QMAKE_PUBLIC_QT_CONFIG) qt_feature("opengles3" PUBLIC LABEL "OpenGL ES 3.0" CONDITION QT_FEATURE_opengles2 AND NOT QT_FEATURE_angle AND TEST_opengles3 ) -qt_feature_definition("opengles3" "QT_OPENGL_ES_3") qt_feature("opengles31" PUBLIC LABEL "OpenGL ES 3.1" CONDITION QT_FEATURE_opengles3 AND TEST_opengles31 ) -qt_feature_definition("opengles31" "QT_OPENGL_ES_3_1") qt_feature("opengles32" PUBLIC LABEL "OpenGL ES 3.2" CONDITION QT_FEATURE_opengles31 AND TEST_opengles32 ) -qt_feature_definition("opengles32" "QT_OPENGL_ES_3_2") qt_feature("opengl-desktop" LABEL "Desktop OpenGL" CONDITION ( WIN32 AND NOT WINRT AND NOT QT_FEATURE_opengles2 AND ( MSVC OR OpenGL_OpenGL_FOUND ) ) OR ( NOT WATCHOS AND NOT WIN32 AND NOT WASM AND OpenGL_OpenGL_FOUND ) |