From 1fc39261132f0b3edf89934fd055234f8b19ced1 Mon Sep 17 00:00:00 2001
From: Tuomo Pelkonen <tuomo.pelkonen@gmail.com>
Date: Tue, 5 Jan 2021 14:32:18 +0200
Subject: C++ build fixes for Qt 6.0 on Windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/datavisualizationqml2/declarativescatter.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/datavisualizationqml2/declarativescatter.cpp')

diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp
index 29e56a79..287ca964 100644
--- a/src/datavisualizationqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml2/declarativescatter.cpp
@@ -103,12 +103,13 @@ void DeclarativeScatter::appendSeriesFunc(QQmlListProperty<QScatter3DSeries> *li
     reinterpret_cast<DeclarativeScatter *>(list->data)->addSeries(series);
 }
 
-int DeclarativeScatter::countSeriesFunc(QQmlListProperty<QScatter3DSeries> *list)
+qsizetype DeclarativeScatter::countSeriesFunc(QQmlListProperty<QScatter3DSeries> *list)
 {
     return reinterpret_cast<DeclarativeScatter *>(list->data)->m_scatterController->scatterSeriesList().size();
 }
 
-QScatter3DSeries *DeclarativeScatter::atSeriesFunc(QQmlListProperty<QScatter3DSeries> *list, int index)
+QScatter3DSeries *DeclarativeScatter::atSeriesFunc(QQmlListProperty<QScatter3DSeries> *list,
+                                                   qsizetype index)
 {
     return reinterpret_cast<DeclarativeScatter *>(list->data)->m_scatterController->scatterSeriesList().at(index);
 }
-- 
cgit v1.2.3