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

avoid compiler warnings

This commit is contained in:
Uwe Rathmann 2025-03-31 16:40:52 +02:00
parent a0f80749e1
commit 1d6a1348ef
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/nodes/QskGradientMaterial.cpp
View File

@ -54,16 +54,16 @@ namespace
} }
#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) #if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
// make Qt 5/6 APIs matching
QSGMaterialShader* createShader( QSGMaterialShader* createShader(
QSGRendererInterface::RenderMode ) const override final QSGRendererInterface::RenderMode ) const override final
#else
QSGMaterialShader* createShader() const override final
#endif
{ {
return createShader(); return createMaterialShader();
} }
virtual QSGMaterialShader* createShader() const = 0; virtual QSGMaterialShader* createMaterialShader() const = 0;
#endif
virtual bool setGradient( const QskGradient& ) = 0; virtual bool setGradient( const QskGradient& ) = 0;
}; };
@ -217,7 +217,7 @@ namespace
return GradientMaterial::compare( other ); return GradientMaterial::compare( other );
} }
QSGMaterialShader* createShader() const override; QSGMaterialShader* createMaterialShader() const override;
/* /*
xy: position xy: position
@ -299,7 +299,7 @@ namespace
}; };
#endif #endif
QSGMaterialShader* LinearMaterial::createShader() const QSGMaterialShader* LinearMaterial::createMaterialShader() const
{ {
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
if ( !( flags() & QSGMaterial::RhiShaderWanted ) ) if ( !( flags() & QSGMaterial::RhiShaderWanted ) )
@ -371,7 +371,7 @@ namespace
} }
} }
QSGMaterialShader* createShader() const override; QSGMaterialShader* createMaterialShader() const override;
QVector2D m_center; QVector2D m_center;
QVector2D m_radius; QVector2D m_radius;
@ -465,7 +465,7 @@ namespace
}; };
#endif #endif
QSGMaterialShader* RadialMaterial::createShader() const QSGMaterialShader* RadialMaterial::createMaterialShader() const
{ {
#ifdef SHADER_GL #ifdef SHADER_GL
if ( !( flags() & QSGMaterial::RhiShaderWanted ) ) if ( !( flags() & QSGMaterial::RhiShaderWanted ) )
@ -575,7 +575,7 @@ namespace
return GradientMaterial::compare( other ); return GradientMaterial::compare( other );
} }
QSGMaterialShader* createShader() const override; QSGMaterialShader* createMaterialShader() const override;
QVector2D m_center; QVector2D m_center;
float m_aspectRatio = 1.0; float m_aspectRatio = 1.0;
@ -685,7 +685,7 @@ namespace
}; };
#endif #endif
QSGMaterialShader* ConicMaterial::createShader() const QSGMaterialShader* ConicMaterial::createMaterialShader() const
{ {
#ifdef SHADER_GL #ifdef SHADER_GL
if ( !( flags() & QSGMaterial::RhiShaderWanted ) ) if ( !( flags() & QSGMaterial::RhiShaderWanted ) )