diff options
| author | Tuomo Pelkonen <tuomo.pelkonen@gmail.com> | 2021-01-05 14:32:18 +0200 |
|---|---|---|
| committer | Tuomo Pelkonen <tuomo.pelkonen@gmail.com> | 2021-01-27 10:01:45 +0200 |
| commit | 1fc39261132f0b3edf89934fd055234f8b19ced1 (patch) | |
| tree | 30d122757d41d9e5a3b38db0d4fe5968b611079a /src/datavisualizationqml2/declarativebars.cpp | |
| parent | 8a9decbda73c7ea1c2afd6b14c4fa43bf44cda53 (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/declarativebars.cpp')
| -rw-r--r-- | src/datavisualizationqml2/declarativebars.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp index ca1d3f60..88a80058 100644 --- a/src/datavisualizationqml2/declarativebars.cpp +++ b/src/datavisualizationqml2/declarativebars.cpp @@ -170,12 +170,12 @@ void DeclarativeBars::appendSeriesFunc(QQmlListProperty<QBar3DSeries> *list, QBa reinterpret_cast<DeclarativeBars *>(list->data)->addSeries(series); } -int DeclarativeBars::countSeriesFunc(QQmlListProperty<QBar3DSeries> *list) +qsizetype DeclarativeBars::countSeriesFunc(QQmlListProperty<QBar3DSeries> *list) { return reinterpret_cast<DeclarativeBars *>(list->data)->m_barsController->barSeriesList().size(); } -QBar3DSeries *DeclarativeBars::atSeriesFunc(QQmlListProperty<QBar3DSeries> *list, int index) +QBar3DSeries *DeclarativeBars::atSeriesFunc(QQmlListProperty<QBar3DSeries> *list, qsizetype index) { return reinterpret_cast<DeclarativeBars *>(list->data)->m_barsController->barSeriesList().at(index); } |