diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-11 11:17:04 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-11 11:31:38 +0200 |
| commit | c6ed50e68438e5558e7cda0e36c194a4b99f7f83 (patch) | |
| tree | 8cbb330dc82eae3cb11b2202ba0f34bc6e6988bf /src | |
| parent | a686cb49be8689c5e306e895062f47c37a4f908d (diff) | |
Plugged some memory leaks.
Autotests were also made Valgrind friendly by adding
a final one millisecond wait to the end of the test to
allow pending deleteLaters to run.
Also some minor cosmetic cleanup done to autotests.
Change-Id: Ic3719167a22949f243eaf54614e174a681dbe34a
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/charts/animations/boxwhiskersanimation.cpp | 1 | ||||
| -rw-r--r-- | src/charts/barchart/qabstractbarseries.cpp | 2 | ||||
| -rw-r--r-- | src/charts/boxplotchart/qboxset.cpp | 1 | ||||
| -rw-r--r-- | src/charts/linechart/qlineseries.cpp | 2 | ||||
| -rw-r--r-- | src/charts/qchart.cpp | 1 |
5 files changed, 6 insertions, 1 deletions
diff --git a/src/charts/animations/boxwhiskersanimation.cpp b/src/charts/animations/boxwhiskersanimation.cpp index 201ffb89..72ae7ef2 100644 --- a/src/charts/animations/boxwhiskersanimation.cpp +++ b/src/charts/animations/boxwhiskersanimation.cpp @@ -32,6 +32,7 @@ QT_CHARTS_BEGIN_NAMESPACE BoxWhiskersAnimation::BoxWhiskersAnimation(BoxWhiskers *box, BoxPlotAnimation *boxPlotAnimation) : ChartAnimation(box), m_box(box), + m_changeAnimation(false), m_boxPlotAnimation(boxPlotAnimation) { setDuration(ChartAnimationDuration); diff --git a/src/charts/barchart/qabstractbarseries.cpp b/src/charts/barchart/qabstractbarseries.cpp index 9c11f921..e049ee53 100644 --- a/src/charts/barchart/qabstractbarseries.cpp +++ b/src/charts/barchart/qabstractbarseries.cpp @@ -405,6 +405,8 @@ bool QAbstractBarSeries::append(QList<QBarSet *> sets) Q_D(QAbstractBarSeries); bool success = d->append(sets); if (success) { + foreach (QBarSet *set, sets) + set->setParent(this); emit barsetsAdded(sets); emit countChanged(); } diff --git a/src/charts/boxplotchart/qboxset.cpp b/src/charts/boxplotchart/qboxset.cpp index d90ad68d..007dd3c6 100644 --- a/src/charts/boxplotchart/qboxset.cpp +++ b/src/charts/boxplotchart/qboxset.cpp @@ -277,6 +277,7 @@ QBoxSetPrivate::QBoxSetPrivate(const QString label, QBoxSet *parent) : QObject(p QBoxSetPrivate::~QBoxSetPrivate() { + delete[] m_values; } bool QBoxSetPrivate::append(qreal value) diff --git a/src/charts/linechart/qlineseries.cpp b/src/charts/linechart/qlineseries.cpp index 15728dbf..4f03fce7 100644 --- a/src/charts/linechart/qlineseries.cpp +++ b/src/charts/linechart/qlineseries.cpp @@ -140,7 +140,7 @@ QLineSeriesPrivate::QLineSeriesPrivate(QLineSeries *q) : QXYSeriesPrivate(q) { -}; +} void QLineSeriesPrivate::initializeGraphics(QGraphicsItem *parent) { diff --git a/src/charts/qchart.cpp b/src/charts/qchart.cpp index a7f58941..28b4f520 100644 --- a/src/charts/qchart.cpp +++ b/src/charts/qchart.cpp @@ -769,6 +769,7 @@ QChartPrivate::QChartPrivate(QChart *q, QChart::ChartType type): QChartPrivate::~QChartPrivate() { + delete m_themeManager; } // Hackish solution to the problem of explicitly assigning the default pen/brush/font |