diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-04-15 13:48:38 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-04-17 07:27:56 +0200 |
| commit | ac009a9671ad97e9bc599676c35acd4628e45e7b (patch) | |
| tree | 4a6cc8da2f7e0605ca0b3ca4c5644d292f1ff201 /src/particles | |
| parent | c3fcbe73189b26e49ad8fa824b2b8e6b7db0a8f4 (diff) | |
Get rid of Q_OPENGL_ES* macros
These macros are no longer defined, and we will use QT_CONFIG
instead, since that is more robust (it checks against
misspellings).
This also removes some dead code from the WebKit code in
Qt QML. The condition never resolved to true in our case
since Qt QML does not depend on Qt GUI, so even before
the macro would not be set. This is just a leftover
anyway, as the graphical parts are not used in QML.
Task-number: QTBUG-83467
Change-Id: I2c4b7f928538cc75ce408deb357f8fd92a84d8e4
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/particles')
| -rw-r--r-- | src/particles/qquickimageparticle.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index 4d67691771..ce7e99a3a0 100644 --- a/src/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp @@ -606,14 +606,14 @@ public: } void activate() override { -#if !defined(QT_OPENGL_ES_2) && !defined(Q_OS_WIN) +#if !QT_CONFIG(opengles2) && !defined(Q_OS_WIN) glEnable(GL_POINT_SPRITE); glEnable(GL_VERTEX_PROGRAM_POINT_SIZE); #endif } void deactivate() override { -#if !defined(QT_OPENGL_ES_2) && !defined(Q_OS_WIN) +#if !QT_CONFIG(opengles2) && !defined(Q_OS_WIN) glDisable(GL_POINT_SPRITE); glDisable(GL_VERTEX_PROGRAM_POINT_SIZE); #endif @@ -754,14 +754,14 @@ public: } void activate() override { -#if !defined(QT_OPENGL_ES_2) && !defined(Q_OS_WIN) +#if !QT_CONFIG(opengles2) && !defined(Q_OS_WIN) glEnable(GL_POINT_SPRITE); glEnable(GL_VERTEX_PROGRAM_POINT_SIZE); #endif } void deactivate() override { -#if !defined(QT_OPENGL_ES_2) && !defined(Q_OS_WIN) +#if !QT_CONFIG(opengles2) && !defined(Q_OS_WIN) glDisable(GL_POINT_SPRITE); glDisable(GL_VERTEX_PROGRAM_POINT_SIZE); #endif |