summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2/declarativetheme.cpp
diff options
context:
space:
mode:
authorTuomo Pelkonen <tuomo.pelkonen@gmail.com>2021-01-05 14:32:18 +0200
committerTuomo Pelkonen <tuomo.pelkonen@gmail.com>2021-01-27 10:01:45 +0200
commit1fc39261132f0b3edf89934fd055234f8b19ced1 (patch)
tree30d122757d41d9e5a3b38db0d4fe5968b611079a /src/datavisualizationqml2/declarativetheme.cpp
parent8a9decbda73c7ea1c2afd6b14c4fa43bf44cda53 (diff)
C++ build fixes for Qt 6.0 on Windows
Fixes c++ build issues with Qt 6.0, verified to work on Windows. Changed QQmlListProperty constructors functions types from int to qsizetype GeometryChanged changed to GeometryChange createTextureFromNativeObject changed to QNativeInterface::QSGOpenGLTexture::fromNative clearBeforeRendering and setClearBeforeRendering removed Task-number: QTBUG-89297 Change-Id: I84c723560de2821572af00f62e7780445b6c2595 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/datavisualizationqml2/declarativetheme.cpp')
-rw-r--r--src/datavisualizationqml2/declarativetheme.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/datavisualizationqml2/declarativetheme.cpp b/src/datavisualizationqml2/declarativetheme.cpp
index c3d283bf..7d65c586 100644
--- a/src/datavisualizationqml2/declarativetheme.cpp
+++ b/src/datavisualizationqml2/declarativetheme.cpp
@@ -362,13 +362,13 @@ void DeclarativeTheme3D::appendBaseColorsFunc(QQmlListProperty<DeclarativeColor>
reinterpret_cast<DeclarativeTheme3D *>(list->data)->addColor(color);
}
-int DeclarativeTheme3D::countBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list)
+qsizetype DeclarativeTheme3D::countBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list)
{
return reinterpret_cast<DeclarativeTheme3D *>(list->data)->colorList().size();
}
DeclarativeColor *DeclarativeTheme3D::atBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list,
- int index)
+ qsizetype index)
{
return reinterpret_cast<DeclarativeTheme3D *>(list->data)->colorList().at(index);
}
@@ -393,13 +393,13 @@ void DeclarativeTheme3D::appendBaseGradientsFunc(QQmlListProperty<ColorGradient>
reinterpret_cast<DeclarativeTheme3D *>(list->data)->addGradient(gradient);
}
-int DeclarativeTheme3D::countBaseGradientsFunc(QQmlListProperty<ColorGradient> *list)
+qsizetype DeclarativeTheme3D::countBaseGradientsFunc(QQmlListProperty<ColorGradient> *list)
{
return reinterpret_cast<DeclarativeTheme3D *>(list->data)->gradientList().size();
}
ColorGradient *DeclarativeTheme3D::atBaseGradientsFunc(QQmlListProperty<ColorGradient> *list,
- int index)
+ qsizetype index)
{
return reinterpret_cast<DeclarativeTheme3D *>(list->data)->gradientList().at(index);
}