From 089abcfe40479b24990671538c39a8dc0ff8f5ce Mon Sep 17 00:00:00 2001 From: James Turner Date: Sun, 19 Nov 2017 21:57:14 +0100 Subject: [PATCH] Fix FGQCanvas compilation with Qt 5.7 Use raw OpenGL type constants instead of the QSG aliases which were only added in 5.8 --- utils/fgqcanvas/fgcanvaspath.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/fgqcanvas/fgcanvaspath.cpp b/utils/fgqcanvas/fgcanvaspath.cpp index 521fb137f..b66869fe4 100644 --- a/utils/fgqcanvas/fgcanvaspath.cpp +++ b/utils/fgqcanvas/fgcanvaspath.cpp @@ -76,11 +76,11 @@ public: QTransform transform; QTriangleSet triangles = qTriangulate(m_path, transform); - int indexType = QSGGeometry::UnsignedShortType; + int indexType = GL_UNSIGNED_SHORT; if (triangles.indices.type() == QVertexIndexVector::UnsignedShort) { // default is fine } else if (triangles.indices.type() == QVertexIndexVector::UnsignedInt) { - indexType = QSGGeometry::UnsignedIntType; + indexType = GL_UNSIGNED_INT; } else { qFatal("Unsupported triangle index type"); }