summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--src/datavisualizationqml2/abstractdeclarative.cpp14
-rw-r--r--src/datavisualizationqml2/abstractdeclarative_p.h6
-rw-r--r--src/datavisualizationqml2/declarativebars.cpp4
-rw-r--r--src/datavisualizationqml2/declarativebars_p.h4
-rw-r--r--src/datavisualizationqml2/declarativerendernode.cpp4
-rw-r--r--src/datavisualizationqml2/declarativescatter.cpp5
-rw-r--r--src/datavisualizationqml2/declarativescatter_p.h4
-rw-r--r--src/datavisualizationqml2/declarativesurface.cpp5
-rw-r--r--src/datavisualizationqml2/declarativesurface_p.h4
-rw-r--r--src/datavisualizationqml2/declarativetheme.cpp8
-rw-r--r--src/datavisualizationqml2/declarativetheme_p.h10
11 files changed, 32 insertions, 36 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index 5a1edbc7..daec035e 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -272,13 +272,13 @@ void AbstractDeclarative::appendCustomItemFunc(QQmlListProperty<QCustom3DItem> *
decl->addCustomItem(item);
}
-int AbstractDeclarative::countCustomItemFunc(QQmlListProperty<QCustom3DItem> *list)
+qsizetype AbstractDeclarative::countCustomItemFunc(QQmlListProperty<QCustom3DItem> *list)
{
return reinterpret_cast<AbstractDeclarative *>(list->data)->m_controller->m_customItems.size();
}
QCustom3DItem *AbstractDeclarative::atCustomItemFunc(QQmlListProperty<QCustom3DItem> *list,
- int index)
+ qsizetype index)
{
return reinterpret_cast<AbstractDeclarative *>(list->data)->m_controller->m_customItems.at(index);
}
@@ -491,9 +491,9 @@ void AbstractDeclarative::handleWindowChanged(QQuickWindow *window)
#endif
}
-void AbstractDeclarative::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void AbstractDeclarative::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
{
- QQuickItem::geometryChanged(newGeometry, oldGeometry);
+ QQuickItem::geometryChange(newGeometry, oldGeometry);
m_cachedGeometry = newGeometry;
@@ -679,8 +679,6 @@ void AbstractDeclarative::checkWindowList(QQuickWindow *window)
if (oldWindow && !windowList.contains(oldWindow)
&& windowClearList.contains(oldWindow)) {
- // Return window clear value
- oldWindow->setClearBeforeRendering(windowClearList.value(oldWindow));
windowClearList.remove(oldWindow);
}
@@ -692,10 +690,6 @@ void AbstractDeclarative::checkWindowList(QQuickWindow *window)
if ((m_renderMode == RenderDirectToBackground
|| m_renderMode == RenderDirectToBackground_NoClear)
&& !windowClearList.contains(window)) {
- // Save old clear value
- windowClearList[window] = window->clearBeforeRendering();
- // Disable clearing of the window as we render underneath
- window->setClearBeforeRendering(false);
}
}
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
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);
}
diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h
index 1f48b73e..f7db771b 100644
--- a/src/datavisualizationqml2/declarativebars_p.h
+++ b/src/datavisualizationqml2/declarativebars_p.h
@@ -87,8 +87,8 @@ public:
QQmlListProperty<QBar3DSeries> seriesList();
static void appendSeriesFunc(QQmlListProperty<QBar3DSeries> *list, QBar3DSeries *series);
- static int countSeriesFunc(QQmlListProperty<QBar3DSeries> *list);
- static QBar3DSeries *atSeriesFunc(QQmlListProperty<QBar3DSeries> *list, int index);
+ static qsizetype countSeriesFunc(QQmlListProperty<QBar3DSeries> *list);
+ static QBar3DSeries *atSeriesFunc(QQmlListProperty<QBar3DSeries> *list, qsizetype index);
static void clearSeriesFunc(QQmlListProperty<QBar3DSeries> *list);
Q_INVOKABLE void addSeries(QBar3DSeries *series);
Q_INVOKABLE void removeSeries(QBar3DSeries *series);
diff --git a/src/datavisualizationqml2/declarativerendernode.cpp b/src/datavisualizationqml2/declarativerendernode.cpp
index a5eb027e..d262f63f 100644
--- a/src/datavisualizationqml2/declarativerendernode.cpp
+++ b/src/datavisualizationqml2/declarativerendernode.cpp
@@ -114,9 +114,7 @@ void DeclarativeRenderNode::updateFBO()
delete m_texture;
const uint id = m_fbo->texture();
- m_texture =
- m_window->createTextureFromNativeObject(QQuickWindow::NativeObjectTexture,
- &id, 0 /* nativeLayout */, m_size);
+ m_texture = QNativeInterface::QSGOpenGLTexture::fromNative(id, m_window, m_size);
m_material.setTexture(m_texture);
m_materialO.setTexture(m_texture);
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);
}
diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h
index 6323c9ca..6c88b121 100644
--- a/src/datavisualizationqml2/declarativescatter_p.h
+++ b/src/datavisualizationqml2/declarativescatter_p.h
@@ -70,8 +70,8 @@ public:
QQmlListProperty<QScatter3DSeries> seriesList();
static void appendSeriesFunc(QQmlListProperty<QScatter3DSeries> *list, QScatter3DSeries *series);
- static int countSeriesFunc(QQmlListProperty<QScatter3DSeries> *list);
- static QScatter3DSeries *atSeriesFunc(QQmlListProperty<QScatter3DSeries> *list, int index);
+ static qsizetype countSeriesFunc(QQmlListProperty<QScatter3DSeries> *list);
+ static QScatter3DSeries *atSeriesFunc(QQmlListProperty<QScatter3DSeries> *list, qsizetype index);
static void clearSeriesFunc(QQmlListProperty<QScatter3DSeries> *list);
Q_INVOKABLE void addSeries(QScatter3DSeries *series);
Q_INVOKABLE void removeSeries(QScatter3DSeries *series);
diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp
index 2e210246..580390bb 100644
--- a/src/datavisualizationqml2/declarativesurface.cpp
+++ b/src/datavisualizationqml2/declarativesurface.cpp
@@ -115,12 +115,13 @@ void DeclarativeSurface::appendSeriesFunc(QQmlListProperty<QSurface3DSeries> *li
reinterpret_cast<DeclarativeSurface *>(list->data)->addSeries(series);
}
-int DeclarativeSurface::countSeriesFunc(QQmlListProperty<QSurface3DSeries> *list)
+qsizetype DeclarativeSurface::countSeriesFunc(QQmlListProperty<QSurface3DSeries> *list)
{
return reinterpret_cast<DeclarativeSurface *>(list->data)->m_surfaceController->surfaceSeriesList().size();
}
-QSurface3DSeries *DeclarativeSurface::atSeriesFunc(QQmlListProperty<QSurface3DSeries> *list, int index)
+QSurface3DSeries *DeclarativeSurface::atSeriesFunc(QQmlListProperty<QSurface3DSeries> *list,
+ qsizetype index)
{
return reinterpret_cast<DeclarativeSurface *>(list->data)->m_surfaceController->surfaceSeriesList().at(index);
}
diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h
index a23fe389..5b9bb8fa 100644
--- a/src/datavisualizationqml2/declarativesurface_p.h
+++ b/src/datavisualizationqml2/declarativesurface_p.h
@@ -71,8 +71,8 @@ public:
QQmlListProperty<QSurface3DSeries> seriesList();
static void appendSeriesFunc(QQmlListProperty<QSurface3DSeries> *list, QSurface3DSeries *series);
- static int countSeriesFunc(QQmlListProperty<QSurface3DSeries> *list);
- static QSurface3DSeries *atSeriesFunc(QQmlListProperty<QSurface3DSeries> *list, int index);
+ static qsizetype countSeriesFunc(QQmlListProperty<QSurface3DSeries> *list);
+ static QSurface3DSeries *atSeriesFunc(QQmlListProperty<QSurface3DSeries> *list, qsizetype index);
static void clearSeriesFunc(QQmlListProperty<QSurface3DSeries> *list);
Q_INVOKABLE void addSeries(QSurface3DSeries *series);
Q_INVOKABLE void removeSeries(QSurface3DSeries *series);
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);
}
diff --git a/src/datavisualizationqml2/declarativetheme_p.h b/src/datavisualizationqml2/declarativetheme_p.h
index c0f44404..8562b982 100644
--- a/src/datavisualizationqml2/declarativetheme_p.h
+++ b/src/datavisualizationqml2/declarativetheme_p.h
@@ -70,15 +70,17 @@ public:
QQmlListProperty<DeclarativeColor> baseColors();
static void appendBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list,
DeclarativeColor *color);
- static int countBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list);
- static DeclarativeColor *atBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list, int index);
+ static qsizetype countBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list);
+ static DeclarativeColor *atBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list,
+ qsizetype index);
static void clearBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list);
QQmlListProperty<ColorGradient> baseGradients();
static void appendBaseGradientsFunc(QQmlListProperty<ColorGradient> *list,
ColorGradient *gradient);
- static int countBaseGradientsFunc(QQmlListProperty<ColorGradient> *list);
- static ColorGradient *atBaseGradientsFunc(QQmlListProperty<ColorGradient> *list, int index);
+ static qsizetype countBaseGradientsFunc(QQmlListProperty<ColorGradient> *list);
+ static ColorGradient *atBaseGradientsFunc(QQmlListProperty<ColorGradient> *list,
+ qsizetype index);
static void clearBaseGradientsFunc(QQmlListProperty<ColorGradient> *list);
void setSingleHighlightGradient(ColorGradient *gradient);