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.json | |
| 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.json')
| -rw-r--r-- | src/gui/configure.json | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index cf33408991..3a3f579446 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1115,7 +1115,6 @@ "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" }, { "type": "varAssign", "name": "QMAKE_FXC_LOCATION", "value": "tests.fxc.value" } ] }, @@ -1319,33 +1318,28 @@ "condition": "(config.win32 && !features.opengl-dynamic) || (!config.watchos && !features.opengl-desktop && libs.opengl_es2)", "output": [ "publicFeature", - "publicQtConfig", - { "type": "define", "name": "QT_OPENGL_ES" }, - { "type": "define", "name": "QT_OPENGL_ES_2" } + "publicQtConfig" ] }, "opengles3": { "label": "OpenGL ES 3.0", "condition": "features.opengles2 && !features.angle && tests.opengles3", "output": [ - "publicFeature", - { "type": "define", "name": "QT_OPENGL_ES_3" } + "publicFeature" ] }, "opengles31": { "label": "OpenGL ES 3.1", "condition": "features.opengles3 && tests.opengles31", "output": [ - "publicFeature", - { "type": "define", "name": "QT_OPENGL_ES_3_1" } + "publicFeature" ] }, "opengles32": { "label": "OpenGL ES 3.2", "condition": "features.opengles31 && tests.opengles32", "output": [ - "publicFeature", - { "type": "define", "name": "QT_OPENGL_ES_3_2" } + "publicFeature" ] }, "opengl-desktop": { |