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/opengl/qopengltexturehelper_p.h | |
| 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/opengl/qopengltexturehelper_p.h')
| -rw-r--r-- | src/opengl/qopengltexturehelper_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qopengltexturehelper_p.h b/src/opengl/qopengltexturehelper_p.h index a62a47d029..d3c17c33a4 100644 --- a/src/opengl/qopengltexturehelper_p.h +++ b/src/opengl/qopengltexturehelper_p.h @@ -628,7 +628,7 @@ public: int val = 0; functions->glGetIntegerv(GL_UNPACK_ALIGNMENT, &val); options.setAlignment(val); -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) functions->glGetIntegerv(GL_UNPACK_SKIP_IMAGES, &val); options.setSkipImages(val); functions->glGetIntegerv(GL_UNPACK_SKIP_ROWS, &val); @@ -651,7 +651,7 @@ public: inline void setPixelUploadOptions(const QOpenGLPixelTransferOptions &options) { functions->glPixelStorei(GL_UNPACK_ALIGNMENT, options.alignment()); -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) functions->glPixelStorei(GL_UNPACK_SKIP_IMAGES, options.skipImages()); functions->glPixelStorei(GL_UNPACK_SKIP_ROWS, options.skipRows()); functions->glPixelStorei(GL_UNPACK_SKIP_PIXELS, options.skipPixels()); |