summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-03 15:32:22 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-03 15:32:22 +0200
commitbad8005fc6601fb434bc4ab40e698a0c483f30aa (patch)
tree039596b4ba708f863af0f9dd2fa256b61c5fc31f /src
parent5bc7cc7c5c9f4bdc72ae23c16c3c78d6bff86365 (diff)
parent5c0c2dff8b862a32cd1ce96ca44f855298e6dbf1 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Diffstat (limited to 'src')
-rw-r--r--src/charts/candlestickchart/qcandlestickseries.cpp5
-rw-r--r--src/charts/chartdataset.cpp4
2 files changed, 5 insertions, 4 deletions
diff --git a/src/charts/candlestickchart/qcandlestickseries.cpp b/src/charts/candlestickchart/qcandlestickseries.cpp
index b02bb5cd..8aefca54 100644
--- a/src/charts/candlestickchart/qcandlestickseries.cpp
+++ b/src/charts/candlestickchart/qcandlestickseries.cpp
@@ -553,7 +553,7 @@ bool QCandlestickSeries::remove(const QList<QCandlestickSet *> &sets)
emit candlestickSetsRemoved(sets);
emit countChanged();
foreach (QCandlestickSet *set, sets)
- set->deleteLater();
+ delete set;
}
return success;
@@ -630,7 +630,7 @@ void QCandlestickSeries::clear()
emit candlestickSetsRemoved(sets);
emit countChanged();
foreach (QCandlestickSet *set, sets)
- set->deleteLater();
+ delete set;
}
}
@@ -931,6 +931,7 @@ QCandlestickSeriesPrivate::QCandlestickSeriesPrivate(QCandlestickSeries *q)
QCandlestickSeriesPrivate::~QCandlestickSeriesPrivate()
{
disconnect(this, 0, 0, 0);
+ qDeleteAll(m_sets);
}
void QCandlestickSeriesPrivate::initializeDomain()
diff --git a/src/charts/chartdataset.cpp b/src/charts/chartdataset.cpp
index 3fe0f2eb..4fec0ae1 100644
--- a/src/charts/chartdataset.cpp
+++ b/src/charts/chartdataset.cpp
@@ -421,7 +421,7 @@ void ChartDataSet::deleteAllSeries()
{
foreach (QAbstractSeries *s , m_seriesList){
removeSeries(s);
- s->deleteLater();
+ delete s;
}
Q_ASSERT(m_seriesList.count() == 0);
}
@@ -430,7 +430,7 @@ void ChartDataSet::deleteAllAxes()
{
foreach (QAbstractAxis *a , m_axisList){
removeAxis(a);
- a->deleteLater();
+ delete a;
}
Q_ASSERT(m_axisList.count() == 0);
}