diff options
| -rw-r--r-- | src/quick/items/qquickshadereffectsource_p.h | 13 | ||||
| -rw-r--r-- | src/quick/scenegraph/adaptations/software/qsgsoftwareninepatchnode_p.h | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/quick/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h index 5d7ed2ad2d..680ba85aa1 100644 --- a/src/quick/items/qquickshadereffectsource_p.h +++ b/src/quick/items/qquickshadereffectsource_p.h @@ -93,19 +93,12 @@ public: Repeat }; Q_ENUM(WrapMode) -#ifndef QT_NO_OPENGL - enum Format { - Alpha = GL_ALPHA, - RGB = GL_RGB, - RGBA = GL_RGBA - }; -#else + // Equivalents to GL_ALPHA and similar type constants. enum Format { Alpha = 0x1906, - RGB, - RGBA + RGB = 0x1907, + RGBA = 0x1908 }; -#endif Q_ENUM(Format) enum TextureMirroring { diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwareninepatchnode_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwareninepatchnode_p.h index 62559c933c..bc7aec1b5a 100644 --- a/src/quick/scenegraph/adaptations/software/qsgsoftwareninepatchnode_p.h +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareninepatchnode_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE class QSGSoftwareNinePatchNode : public QSGNinePatchNode { -public: +public: QSGSoftwareNinePatchNode(); void setTexture(QSGTexture *texture) override; |