diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:00:52 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 21:25:09 +0100 |
commit | c6a8bae2563bf883b483c5bfa8b2caf15a1fb33b (patch) | |
tree | 6ed846020c66b638a9f2895749d2104fd7d33c1f /examples | |
parent | 7dd95d1d4cb65662a9bbb739163b7e12f3d81a84 (diff) | |
parent | 172dbad2db094148323fd8a9e6ab44c72a9fa88e (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: I4e39ad733fec72e2233cd16fc50c96ca96280782
Diffstat (limited to 'examples')
-rw-r--r-- | examples/datavisualization/qmloscilloscope/datasource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/datavisualization/qmloscilloscope/datasource.cpp b/examples/datavisualization/qmloscilloscope/datasource.cpp index 843eb3d6..19580e03 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.cpp +++ b/examples/datavisualization/qmloscilloscope/datasource.cpp @@ -40,7 +40,7 @@ Q_DECLARE_METATYPE(QSurface3DSeries *) DataSource::DataSource(QObject *parent) : QObject(parent), m_index(-1), - m_resetArray(0) + m_resetArray(nullptr) { //! [4] qRegisterMetaType<QSurface3DSeries *>(); @@ -126,7 +126,7 @@ void DataSource::update(QSurface3DSeries *series) // If the first time or the dimensions of the cache array have changed, // reconstruct the reset array - if (m_resetArray || series->dataProxy()->rowCount() != newRowCount + if (!m_resetArray || series->dataProxy()->rowCount() != newRowCount || series->dataProxy()->columnCount() != newColumnCount) { m_resetArray = new QSurfaceDataArray(); m_resetArray->reserve(newRowCount); |