diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-24 03:01:11 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-26 08:52:12 +0100 |
| commit | 23e00330af664f8e55fc14621a845661efcadf5f (patch) | |
| tree | f063965b93f183333bd4cdf3ee7440725ae9abf1 /examples | |
| parent | 51c361b85ca7fe4194b3c2d2a0e5ebead6cf30ae (diff) | |
| parent | 2e3983d554e67069a1bd74d5df4486250957c568 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'examples')
3 files changed, 3 insertions, 3 deletions
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] |