From 7b5fa0f9f8ab08ee863530fd7b1a0a49338fc9ba Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Fri, 23 Oct 2020 12:51:31 +0200 Subject: [PATCH] Qt6 incompatibilities fixed --- examples/automotive/SpeedometerSkinlet.cpp | 4 ++++ examples/gallery/slider/CustomSliderSkinlet.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/examples/automotive/SpeedometerSkinlet.cpp b/examples/automotive/SpeedometerSkinlet.cpp index 8f865475..764a2e71 100644 --- a/examples/automotive/SpeedometerSkinlet.cpp +++ b/examples/automotive/SpeedometerSkinlet.cpp @@ -27,7 +27,11 @@ namespace TicksNode() : m_geometry( QSGGeometry::defaultAttributes_Point2D(), 0 ) { +#if QT_VERSION >= QT_VERSION_CHECK( 5, 8, 0 ) + m_geometry.setDrawingMode( QSGGeometry::DrawLines ); +#else m_geometry.setDrawingMode( GL_LINES ); +#endif m_geometry.setVertexDataPattern( QSGGeometry::StaticPattern ); setGeometry( &m_geometry ); diff --git a/examples/gallery/slider/CustomSliderSkinlet.cpp b/examples/gallery/slider/CustomSliderSkinlet.cpp index 2c223af8..fbd0e355 100644 --- a/examples/gallery/slider/CustomSliderSkinlet.cpp +++ b/examples/gallery/slider/CustomSliderSkinlet.cpp @@ -37,7 +37,11 @@ namespace TicksNode( const QColor& color ) : m_geometry( QSGGeometry::defaultAttributes_Point2D(), 0 ) { +#if QT_VERSION >= QT_VERSION_CHECK( 5, 8, 0 ) + m_geometry.setDrawingMode( QSGGeometry::DrawLines ); +#else m_geometry.setDrawingMode( GL_LINES ); +#endif m_geometry.setVertexDataPattern( QSGGeometry::StaticPattern ); m_material.setColor( color );