168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qt6 incompatibilities fixed

This commit is contained in:
Uwe Rathmann 2020-10-23 12:51:31 +02:00
parent b351e078f5
commit 7b5fa0f9f8
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/automotive/SpeedometerSkinlet.cpp
View File

@ -27,7 +27,11 @@ namespace
TicksNode() TicksNode()
: m_geometry( QSGGeometry::defaultAttributes_Point2D(), 0 ) : 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 ); m_geometry.setDrawingMode( GL_LINES );
#endif
m_geometry.setVertexDataPattern( QSGGeometry::StaticPattern ); m_geometry.setVertexDataPattern( QSGGeometry::StaticPattern );
setGeometry( &m_geometry ); setGeometry( &m_geometry );

4
examples/gallery/slider/CustomSliderSkinlet.cpp
View File

@ -37,7 +37,11 @@ namespace
TicksNode( const QColor& color ) TicksNode( const QColor& color )
: m_geometry( QSGGeometry::defaultAttributes_Point2D(), 0 ) : 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 ); m_geometry.setDrawingMode( GL_LINES );
#endif
m_geometry.setVertexDataPattern( QSGGeometry::StaticPattern ); m_geometry.setVertexDataPattern( QSGGeometry::StaticPattern );
m_material.setColor( color ); m_material.setColor( color );