diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-03-17 16:05:35 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-03-17 16:08:28 +0100 |
| commit | bf4efac4ed2f3b1ff11fd1361506dec3c2a8726c (patch) | |
| tree | f6267744ec62ad67a80607dd51fb6cf45632bdda /src/imports/shaders/scenegraph/qsggeometry.h | |
| parent | e960ecdeb9a2dec5917ffba6bf607f124713ae53 (diff) | |
| parent | dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295 (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: Icf88d0a2abb226cf067ba13d3d7b3d4bf8075a8c
Diffstat (limited to 'src/imports/shaders/scenegraph/qsggeometry.h')
| -rw-r--r-- | src/imports/shaders/scenegraph/qsggeometry.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/shaders/scenegraph/qsggeometry.h b/src/imports/shaders/scenegraph/qsggeometry.h index f61489c9..53c61674 100644 --- a/src/imports/shaders/scenegraph/qsggeometry.h +++ b/src/imports/shaders/scenegraph/qsggeometry.h @@ -136,13 +136,13 @@ inline quint16 *QSGGeometry::indexDataAsUShort() inline const uint *QSGGeometry::indexDataAsUInt() const { Q_ASSERT(m_index_type == GL_UNSIGNED_INT); - return (uint *) indexData(); + return (const uint *) indexData(); } inline const quint16 *QSGGeometry::indexDataAsUShort() const { Q_ASSERT(m_index_type == GL_UNSIGNED_SHORT); - return (quint16 *) indexData(); + return (const quint16 *) indexData(); } inline QSGGeometry::Point2D *QSGGeometry::vertexDataAsPoint2D() |