diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-05-20 10:25:31 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-05-23 08:06:16 +0000 |
| commit | 592b5b49b6c0043fae5db7721689813ebd226032 (patch) | |
| tree | f649d7143008b4207063a155ca830bf17d4be828 /src/quick/scenegraph/coreapi/qsggeometry.h | |
| parent | af3f256d79122bd8e4dde9b32886e52df98f3c8d (diff) | |
Remove unnecessary ifdef in QSGGeometry
...and fix up the docs for the GL-mirroring enums.
Change-Id: Iafac2bdde2fd1ce6453809b3e3709c89d885f7dc
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsggeometry.h')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsggeometry.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/quick/scenegraph/coreapi/qsggeometry.h b/src/quick/scenegraph/coreapi/qsggeometry.h index 8d0cd03968..1f54b7d81b 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.h +++ b/src/quick/scenegraph/coreapi/qsggeometry.h @@ -144,14 +144,9 @@ public: int indexType = TypeUnsignedShort); virtual ~QSGGeometry(); -#ifndef QT_NO_OPENGL - // ### Qt 6: GL types to be removed from the public API - void setDrawingMode(GLenum mode); - inline GLenum drawingMode() const { return m_drawing_mode; } -#else - void setDrawingMode(int mode); - inline int drawingMode() const { return m_drawing_mode; } -#endif + // must use unsigned int to be compatible with the old GLenum to keep BC + void setDrawingMode(unsigned int mode); + inline unsigned int drawingMode() const { return m_drawing_mode; } void allocate(int vertexCount, int indexCount = 0); |