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/abstractdeclarative_p.h | |
| 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/abstractdeclarative_p.h')
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index 5bfc41c9..72622d35 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -177,11 +177,11 @@ public: QQmlListProperty<QCustom3DItem> customItemList(); static void appendCustomItemFunc(QQmlListProperty<QCustom3DItem> *list, QCustom3DItem *item); - static int countCustomItemFunc(QQmlListProperty<QCustom3DItem> *list); - static QCustom3DItem *atCustomItemFunc(QQmlListProperty<QCustom3DItem> *list, int index); + static qsizetype countCustomItemFunc(QQmlListProperty<QCustom3DItem> *list); + static QCustom3DItem *atCustomItemFunc(QQmlListProperty<QCustom3DItem> *list, qsizetype index); static void clearCustomItemFunc(QQmlListProperty<QCustom3DItem> *list); - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override; void setSharedController(Abstract3DController *controller); // Used to synch up data model from controller to renderer while main thread is locked |