diff options
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | examples/datavisualization/custominput/scatterdatamodifier.cpp | 2 | ||||
-rw-r--r-- | examples/datavisualization/customproxy/rainfallgraph.cpp | 2 | ||||
-rw-r--r-- | examples/datavisualization/qmlaxisformatter/customformatter.cpp | 2 | ||||
-rw-r--r-- | src/datavisualization/utils/surfaceobject.cpp | 11 | ||||
-rw-r--r-- | src/datavisualization/utils/surfaceobject_p.h | 12 | ||||
-rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 4 | ||||
-rw-r--r-- | src/datavisualizationqml2/colorgradient.cpp | 2 | ||||
-rw-r--r-- | src/datavisualizationqml2/declarativerendernode.cpp | 5 |
9 files changed, 19 insertions, 23 deletions
diff --git a/.qmake.conf b/.qmake.conf index 713bb796..b9382872 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,6 +2,6 @@ load(qt_build_config) DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.14.2 +MODULE_VERSION = 5.15.0 CONFIG += warning_clean CMAKE_MODULE_TESTS=- diff --git a/examples/datavisualization/custominput/scatterdatamodifier.cpp b/examples/datavisualization/custominput/scatterdatamodifier.cpp index 1224b168..759f6f2a 100644 --- a/examples/datavisualization/custominput/scatterdatamodifier.cpp +++ b/examples/datavisualization/custominput/scatterdatamodifier.cpp @@ -129,7 +129,7 @@ void ScatterDataModifier::addData() QString line = stream.readLine(); if (line.startsWith("#")) // Ignore comments continue; - QStringList strList = line.split(",", QString::SkipEmptyParts); + QStringList strList = line.split(",", Qt::SkipEmptyParts); // Each line has three data items: xPos, yPos and zPos value if (strList.size() < 3) { qWarning() << "Invalid row read from data:" << line; diff --git a/examples/datavisualization/customproxy/rainfallgraph.cpp b/examples/datavisualization/customproxy/rainfallgraph.cpp index 64db0b22..73cb5bee 100644 --- a/examples/datavisualization/customproxy/rainfallgraph.cpp +++ b/examples/datavisualization/customproxy/rainfallgraph.cpp @@ -138,7 +138,7 @@ void RainfallGraph::addDataSet() QString line = stream.readLine(); if (line.startsWith("#")) // Ignore comments continue; - QStringList strList = line.split(",", QString::SkipEmptyParts); + QStringList strList = line.split(",", Qt::SkipEmptyParts); // Each line has three data items: Year, month, and rainfall value if (strList.size() < 3) { qWarning() << "Invalid row read from data:" << line; diff --git a/examples/datavisualization/qmlaxisformatter/customformatter.cpp b/examples/datavisualization/qmlaxisformatter/customformatter.cpp index e4fa2dd3..6074b778 100644 --- a/examples/datavisualization/qmlaxisformatter/customformatter.cpp +++ b/examples/datavisualization/qmlaxisformatter/customformatter.cpp @@ -164,6 +164,6 @@ void CustomFormatter::setSelectionFormat(const QString &format) //! [0] QDateTime CustomFormatter::valueToDateTime(qreal value) const { - return QDateTime(m_originDate).addMSecs(qint64(oneDayMs * value)); + return m_originDate.startOfDay().addMSecs(qint64(oneDayMs * value)); } //! [0] diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp index 6e15d081..f9e4181e 100644 --- a/src/datavisualization/utils/surfaceobject.cpp +++ b/src/datavisualization/utils/surfaceobject.cpp @@ -35,17 +35,10 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION SurfaceObject::SurfaceObject(Surface3DRenderer *renderer) - : m_surfaceType(Undefined), - m_columns(0), - m_rows(0), - m_gridIndexCount(0), - m_axisCacheX(renderer->m_axisCacheX), + : m_axisCacheX(renderer->m_axisCacheX), m_axisCacheY(renderer->m_axisCacheY), m_axisCacheZ(renderer->m_axisCacheZ), - m_renderer(renderer), - m_returnTextureBuffer(false), - m_dataDimension(0), - m_oldDataDimension(-1) + m_renderer(renderer) { glGenBuffers(1, &m_vertexbuffer); glGenBuffers(1, &m_normalbuffer); diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h index a42fe244..41b6ad5f 100644 --- a/src/datavisualization/utils/surfaceobject_p.h +++ b/src/datavisualization/utils/surfaceobject_p.h @@ -111,11 +111,11 @@ private: bool flipXZ); private: - SurfaceType m_surfaceType; - int m_columns; - int m_rows; + SurfaceType m_surfaceType = Undefined; + int m_columns = 0; + int m_rows = 0; GLuint m_gridElementbuffer; - GLuint m_gridIndexCount; + GLuint m_gridIndexCount = 0; QVector<QVector3D> m_vertices; QVector<QVector3D> m_normals; // Caches are not owned @@ -126,9 +126,9 @@ private: float m_minY; float m_maxY; GLuint m_uvTextureBuffer; - bool m_returnTextureBuffer; + bool m_returnTextureBuffer = false; SurfaceObject::DataDimensions m_dataDimension; - SurfaceObject::DataDimensions m_oldDataDimension; + SurfaceObject::DataDimensions m_oldDataDimension = DataDimensions(-1); }; QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 03d1f41d..4cec3bc8 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -678,7 +678,7 @@ void AbstractDeclarative::checkWindowList(QQuickWindow *window) } if (oldWindow && !windowList.contains(oldWindow) - && windowClearList.values(oldWindow).size() != 0) { + && windowClearList.contains(oldWindow)) { // Return window clear value oldWindow->setClearBeforeRendering(windowClearList.value(oldWindow)); windowClearList.remove(oldWindow); @@ -691,7 +691,7 @@ void AbstractDeclarative::checkWindowList(QQuickWindow *window) if ((m_renderMode == RenderDirectToBackground || m_renderMode == RenderDirectToBackground_NoClear) - && windowClearList.values(window).size() == 0) { + && !windowClearList.contains(window)) { // Save old clear value windowClearList[window] = window->clearBeforeRendering(); // Disable clearing of the window as we render underneath diff --git a/src/datavisualizationqml2/colorgradient.cpp b/src/datavisualizationqml2/colorgradient.cpp index 125b9545..edcca2ec 100644 --- a/src/datavisualizationqml2/colorgradient.cpp +++ b/src/datavisualizationqml2/colorgradient.cpp @@ -77,7 +77,7 @@ ColorGradient::~ColorGradient() QQmlListProperty<ColorGradientStop> ColorGradient::stops() { - return QQmlListProperty<ColorGradientStop>(this, m_stops); + return QQmlListProperty<ColorGradientStop>(this, &m_stops); } void ColorGradient::doUpdate() diff --git a/src/datavisualizationqml2/declarativerendernode.cpp b/src/datavisualizationqml2/declarativerendernode.cpp index 1e3c3542..eac1a36b 100644 --- a/src/datavisualizationqml2/declarativerendernode.cpp +++ b/src/datavisualizationqml2/declarativerendernode.cpp @@ -113,7 +113,10 @@ void DeclarativeRenderNode::updateFBO() QRectF(0, 1, 1, -1)); delete m_texture; - m_texture = m_window->createTextureFromId(m_fbo->texture(), m_size); + const uint id = m_fbo->texture(); + m_texture = + m_window->createTextureFromNativeObject(QQuickWindow::NativeObjectTexture, + &id, 0 /* nativeLayout */, m_size); m_material.setTexture(m_texture); m_materialO.setTexture(m_texture); |