Merge "Merge remote-tracking branch 'origin/5.15' into dev"

7 files changed, 29 insertions, 6 deletions

diff --git a/dist/changes-5.14.1 b/dist/changes-5.14.1
new file mode 100644
index 00000000..d0086381
--- /dev/null
+++ b/dist/changes-5.14.1
@@ -0,0 +1,20 @@
+Qt 5.14.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.14.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.14 series is binary compatible with the 5.13.x series.
+Applications compiled for 5.13 will continue to run with 5.14.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/examples/datavisualization/custominput/scatterdatamodifier.cpp b/examples/datavisualization/custominput/scatterdatamodifier.cpp
index c2578b09..df36f5c6 100644
--- a/examples/datavisualization/custominput/scatterdatamodifier.cpp
+++ b/examples/datavisualization/custominput/scatterdatamodifier.cpp
@@ -130,7 +130,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/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp
index daeedf3c..2f2cf63b 100644
--- a/src/datavisualization/engine/q3dbars.cpp
+++ b/src/datavisualization/engine/q3dbars.cpp
@@ -157,7 +157,7 @@ QBar3DSeries *Q3DBars::primarySeries() const
  * to the axes. If the newly added series has specified a selected bar, it will be highlighted and
  * any existing selection will be cleared. Only one added series can have an active selection.
  *
- * /sa seriesList(), primarySeries
+ * \sa seriesList(), primarySeries
  */
 void Q3DBars::addSeries(QBar3DSeries *series)
 {
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 a1d65a94..a5eb027e 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);