HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2733:c6ed50e68438

Plugged some memory leaks....

Miikka Heikkinen -

r2733:c6ed50e68438

parent child

Context file:

r2733:c6ed50e68438

Expand all files

examples/charts/barmodelmapper/customtablemodel.cpp +5 0

                  }
              }
+             CustomTableModel::~CustomTableModel()
+             {
+                 qDeleteAll(m_data);
+             }
              int CustomTableModel::rowCount(const QModelIndex &parent) const
              {
                  Q_UNUSED(parent)

examples/charts/barmodelmapper/customtablemodel.h +1 0

                  Q_OBJECT
              public:
                  explicit CustomTableModel(QObject *parent = 0);
+                 virtual ~CustomTableModel();
                  int rowCount(const QModelIndex &parent = QModelIndex()) const;
                  int columnCount(const QModelIndex &parent = QModelIndex()) const;

examples/charts/barmodelmapper/tablewidget.cpp +5 -5

              ****************************************************************************/
              #include "tablewidget.h"
-             #include "customtablemodel.h"
              #include <QtWidgets/QGridLayout>
              #include <QtWidgets/QTableView>
              #include <QtCharts/QChart>
                  // create simple model for storing data
                  // user's table data model
                  //! [1]
-                 CustomTableModel *model = new CustomTableModel;
+                 m_model = new CustomTableModel;
                  //! [1]
                  //! [2]
                  // create table view and add model to it
                  QTableView *tableView = new QTableView;
-                 tableView->setModel(model);
+                 tableView->setModel(m_model);
                  tableView->setMinimumWidth(300);
                  tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
                  tableView->verticalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+                 m_model->setParent(tableView);
                  //! [2]
                  //! [3]
                  mapper->setFirstRow(first);
                  mapper->setRowCount(count);
                  mapper->setSeries(series);
-                 mapper->setModel(model);
+                 mapper->setModel(m_model);
                  chart->addSeries(series);
                  //! [4]
                  QList<QBarSet *> barsets = series->barSets();
                  for (int i = 0; i < barsets.count(); i++) {
                      seriesColorHex = "#" + QString::number(barsets.at(i)->brush().color().rgb(), 16).right(6).toUpper();
-                     model->addMapping(seriesColorHex, QRect(1 + i, first, 1, barsets.at(i)->count()));
+                     m_model->addMapping(seriesColorHex, QRect(1 + i, first, 1, barsets.at(i)->count()));
                  }
                  //! [5]

examples/charts/barmodelmapper/tablewidget.h +4 0

              #define TABLEWIDGET_H
              #include <QtWidgets/QWidget>
+             #include "customtablemodel.h"
              class TableWidget : public QWidget
              {
              public:
                  TableWidget(QWidget *parent = 0);
+             private:
+                 CustomTableModel *m_model;
              };
              #endif // TABLEWIDGET_H

src/charts/animations/boxwhiskersanimation.cpp +1 0

              BoxWhiskersAnimation::BoxWhiskersAnimation(BoxWhiskers *box, BoxPlotAnimation *boxPlotAnimation)
                  : ChartAnimation(box),
                    m_box(box),
+                   m_changeAnimation(false),
                    m_boxPlotAnimation(boxPlotAnimation)
              {
                  setDuration(ChartAnimationDuration);

src/charts/barchart/qabstractbarseries.cpp +2 0

                  Q_D(QAbstractBarSeries);
                  bool success = d->append(sets);
                  if (success) {
+                     foreach (QBarSet *set, sets)
+                         set->setParent(this);
                      emit barsetsAdded(sets);
                      emit countChanged();
                  }

src/charts/boxplotchart/qboxset.cpp +1 0

              QBoxSetPrivate::~QBoxSetPrivate()
              {
+                 delete[] m_values;
              }
              bool QBoxSetPrivate::append(qreal value)

src/charts/linechart/qlineseries.cpp +1 -1

                  : QXYSeriesPrivate(q)
              {
-             };
+             }
              void QLineSeriesPrivate::initializeGraphics(QGraphicsItem *parent)
              {

src/charts/qchart.cpp +1 0

              QChartPrivate::~QChartPrivate()
              {
+                 delete m_themeManager;
              }
              // Hackish solution to the problem of explicitly assigning the default pen/brush/font

tests/auto/chartdataset/tst_chartdataset.cpp +8 -3

              void tst_ChartDataSet::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_ChartDataSet::init()
              {
-             	Q_ASSERT(!m_dataset);
+                 Q_ASSERT(!m_dataset);
                  m_dataset = new ChartDataSet(0);
              }
              void tst_ChartDataSet::cleanup()
              {
-               delete m_dataset;
-               m_dataset=0;
+                 delete m_dataset;
+                 m_dataset = 0;
              }
              void tst_ChartDataSet::chartdataset_data()
                  TRY_COMPARE(spy1.count(), 0);
                  TRY_COMPARE(spy2.count(), 0);
                  TRY_COMPARE(spy3.count(), 1);
+                 delete series;
              }
              void tst_ChartDataSet::addAxis_data()
                  TRY_COMPARE(spy1.count(), 1);
                  TRY_COMPARE(spy2.count(), 0);
                  TRY_COMPARE(spy3.count(), 0);
+                 delete axis;
              }
              void tst_ChartDataSet::attachAxis_data()

tests/auto/domain/tst_domain.cpp +4 0

              void tst_Domain::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_Domain::init()
                  TRY_COMPARE(spy0.count(), 0);
                  TRY_COMPARE(spy1.count(), 0);
                  TRY_COMPARE(spy2.count(), 0);
+                 delete domain1;
+                 delete domain2;
              }
              void tst_Domain::setRange_data()

tests/auto/qabstractaxis/tst_qabstractaxis.cpp +1 0

              void tst_QAbstractAxis::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QAbstractAxis::init(QAbstractAxis* axis, QAbstractSeries* series)

tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp +1 0

              void tst_QBarCategoriesAxis::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QBarCategoriesAxis::init()

tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp +40 -29

                  QBarSeries *m_series;
                  QChart *m_chart;
+                 QChartView *m_chartView;
              };
              tst_qbarmodelmapper::tst_qbarmodelmapper():
                  m_vMapper(0),
                  m_hMapper(0),
                  m_series(0),
-                 m_chart(0)
+                 m_chart(0),
+                 m_chartView(0)
              {
              }
              void tst_qbarmodelmapper::initTestCase()
              {
                  m_chart = new QChart;
-                 QChartView *chartView = new QChartView(m_chart);
-                 chartView->show();
+                 m_chartView = new QChartView(m_chart);
+                 m_chartView->show();
              }
              void tst_qbarmodelmapper::cleanupTestCase()
              {
+                 delete m_chartView;
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_qbarmodelmapper::verticalMapper_data()
                  QFETCH(int, lastBarSetColumn);
                  QFETCH(int, expectedBarSetCount);
-                 m_series = new QBarSeries;
+                 QBarSeries *series = new QBarSeries;
                  QVBarModelMapper *mapper = new QVBarModelMapper;
                  mapper->setFirstBarSetColumn(firstBarSetColumn);
                  mapper->setLastBarSetColumn(lastBarSetColumn);
                  mapper->setModel(m_model);
-                 mapper->setSeries(m_series);
+                 mapper->setSeries(series);
-                 m_chart->addSeries(m_series);
+                 m_chart->addSeries(series);
-                 QCOMPARE(m_series->count(), expectedBarSetCount);
+                 QCOMPARE(series->count(), expectedBarSetCount);
                  QCOMPARE(mapper->firstBarSetColumn(), qMax(-1, firstBarSetColumn));
                  QCOMPARE(mapper->lastBarSetColumn(), qMax(-1, lastBarSetColumn));
                  delete mapper;
-                 mapper = 0;
+                 m_chart->removeSeries(series);
+                 delete series;
              }
              void tst_qbarmodelmapper::verticalMapperCustomMapping_data()
                  QFETCH(int, expectedBarSetCount);
                  QFETCH(int, expectedCount);
-                 m_series = new QBarSeries;
+                 QBarSeries *series = new QBarSeries;
-                 QCOMPARE(m_series->count(), 0);
+                 QCOMPARE(series->count(), 0);
                  QVBarModelMapper *mapper = new QVBarModelMapper;
                  mapper->setFirstBarSetColumn(0);
                  mapper->setLastBarSetColumn(1);
                  mapper->setModel(m_model);
-                 mapper->setSeries(m_series);
+                 mapper->setSeries(series);
                  mapper->setFirstRow(first);
                  mapper->setRowCount(countLimit);
-                 m_chart->addSeries(m_series);
+                 m_chart->addSeries(series);
-                 QCOMPARE(m_series->count(), expectedBarSetCount);
+                 QCOMPARE(series->count(), expectedBarSetCount);
                  if (expectedBarSetCount > 0)
-                     QCOMPARE(m_series->barSets().first()->count(), expectedCount);
+                     QCOMPARE(series->barSets().first()->count(), expectedCount);
                  // change values column mapping to invalid
                  mapper->setFirstBarSetColumn(-1);
                  mapper->setLastBarSetColumn(1);
-                 QCOMPARE(m_series->count(), 0);
+                 QCOMPARE(series->count(), 0);
                  delete mapper;
-                 mapper = 0;
+                 m_chart->removeSeries(series);
+                 delete series;
              }
              void tst_qbarmodelmapper::horizontalMapper_data()
                  QFETCH(int, lastBarSetRow);
                  QFETCH(int, expectedBarSetCount);
-                 m_series = new QBarSeries;
+                 QBarSeries *series = new QBarSeries;
                  QHBarModelMapper *mapper = new QHBarModelMapper;
                  mapper->setFirstBarSetRow(firstBarSetRow);
                  mapper->setLastBarSetRow(lastBarSetRow);
                  mapper->setModel(m_model);
-                 mapper->setSeries(m_series);
+                 mapper->setSeries(series);
-                 m_chart->addSeries(m_series);
+                 m_chart->addSeries(series);
-                 QCOMPARE(m_series->count(), expectedBarSetCount);
+                 QCOMPARE(series->count(), expectedBarSetCount);
                  QCOMPARE(mapper->firstBarSetRow(), qMax(-1, firstBarSetRow));
                  QCOMPARE(mapper->lastBarSetRow(), qMax(-1, lastBarSetRow));
                  delete mapper;
-                 mapper = 0;
+                 m_chart->removeSeries(series);
+                 delete series;
              }
              void tst_qbarmodelmapper::horizontalMapperCustomMapping_data()
                  QFETCH(int, expectedBarSetCount);
                  QFETCH(int, expectedCount);
-                 m_series = new QBarSeries;
+                 QBarSeries *series = new QBarSeries;
-                 QCOMPARE(m_series->count(), 0);
+                 QCOMPARE(series->count(), 0);
                  QHBarModelMapper *mapper = new QHBarModelMapper;
                  mapper->setFirstBarSetRow(0);
                  mapper->setLastBarSetRow(1);
                  mapper->setModel(m_model);
-                 mapper->setSeries(m_series);
+                 mapper->setSeries(series);
                  mapper->setFirstColumn(first);
                  mapper->setColumnCount(countLimit);
-                 m_chart->addSeries(m_series);
+                 m_chart->addSeries(series);
-                 QCOMPARE(m_series->count(), expectedBarSetCount);
+                 QCOMPARE(series->count(), expectedBarSetCount);
                  if (expectedBarSetCount > 0)
-                     QCOMPARE(m_series->barSets().first()->count(), expectedCount);
+                     QCOMPARE(series->barSets().first()->count(), expectedCount);
                  // change values column mapping to invalid
                  mapper->setFirstBarSetRow(-1);
                  mapper->setLastBarSetRow(1);
-                 QCOMPARE(m_series->count(), 0);
+                 QCOMPARE(series->count(), 0);
                  delete mapper;
-                 mapper = 0;
+                 m_chart->removeSeries(series);
+                 delete series;
              }
              void tst_qbarmodelmapper::seriesUpdated()
                  QCOMPARE(spy4.count(), 1);
                  QCOMPARE(spy5.count(), 1);
+                 delete mapper;
              }
              void tst_qbarmodelmapper::horizontalMapperSignals()
                  QCOMPARE(spy3.count(), 1);
                  QCOMPARE(spy4.count(), 1);
                  QCOMPARE(spy5.count(), 1);
+                 delete mapper;
              }
              QTEST_MAIN(tst_qbarmodelmapper)

tests/auto/qbarseries/tst_qbarseries.cpp +3 0

              void tst_QBarSeries::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QBarSeries::init()
              {
                  QBarSeries *barseries = new QBarSeries();
                  QVERIFY(barseries != 0);
+                 delete barseries;
              }
              void tst_QBarSeries::type_data()
                  ret = m_barseries->append(invalidList);
                  QVERIFY(ret == false);
                  QVERIFY(m_barseries->count() == count);
+                 delete invalidList.at(0);
                  // Try append list with null pointers (should fail, count remains same)
                  QList<QBarSet*> invalidList2;

tests/auto/qbarset/tst_qbarset.cpp +1 0

              void tst_QBarSet::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QBarSet::init()

tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp +1 0

              void tst_QCategoryAxis::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QCategoryAxis::init()

tests/auto/qchart/tst_qchart.cpp +5 -2

              void tst_QChart::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QChart::init()
                  QTest::addColumn<QAbstractSeries *>("series");
                  QAbstractSeries* line = new QLineSeries(this);
-                 QAbstractSeries* area = new QAreaSeries(static_cast<QLineSeries*>(line));
+                 QAbstractSeries* area = new QAreaSeries(new QLineSeries(this));
                  QAbstractSeries* scatter = new QScatterSeries(this);
                  QAbstractSeries* spline = new QSplineSeries(this);
                  m_chart->removeSeries(series);
                  QVERIFY(!series->chart());
                  QCOMPARE(m_chart->series().count(), 0);
+                 delete series;
              }
              void tst_QChart::animationOptions_data()
                  QVERIFY(m_chart->axisY() != 0);
                  QVERIFY(m_chart->axisY(series)==0);
                  QCOMPARE(deleteSpy.count(), 0);
+                 delete series;
              }
              void tst_QChart::scroll_right_data()
                  QCOMPARE(xAxis->max(), overallmaxX);
                  QCOMPARE(yAxis->min(), overallminY);
                  QCOMPARE(yAxis->max(), overallmaxY);
+                 delete chart;
              }
              void tst_QChart::axisPolarOrientation()

tests/auto/qchartview/tst_qchartview.cpp +1 0

              void tst_QChartView::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QChartView::init()

tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp +1 0

              void tst_QDateTimeAxis::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QDateTimeAxis::init()

tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp +3 0

              void tst_QHorizontalBarSeries::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QHorizontalBarSeries::init()
              {
                  QHorizontalBarSeries *barseries = new QHorizontalBarSeries();
                  QVERIFY(barseries != 0);
+                 delete barseries;
              }
              void tst_QHorizontalBarSeries::type_data()
                  ret = m_barseries->append(invalidList);
                  QVERIFY(ret == false);
                  QVERIFY(m_barseries->count() == count);
+                 delete invalidList.at(0);
                  // Try append list with null pointers (should fail, count remains same)
                  QList<QBarSet*> invalidList2;

tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp +2 0

              void tst_QHorizontalPercentBarSeries::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QHorizontalPercentBarSeries::init()
              {
                  QHorizontalPercentBarSeries *barseries = new QHorizontalPercentBarSeries();
                  QVERIFY(barseries != 0);
+                 delete barseries;
              }
              void tst_QHorizontalPercentBarSeries::type_data()

tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp +2 0

              void tst_QHorizontalStackedBarSeries::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QHorizontalStackedBarSeries::init()
              {
                  QHorizontalStackedBarSeries *barseries = new QHorizontalStackedBarSeries();
                  QVERIFY(barseries != 0);
+                 delete barseries;
              }
              void tst_QHorizontalStackedBarSeries::type_data()

tests/auto/qlegend/tst_qlegend.cpp +11 -8

              void tst_QLegend::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QLegend::init()
                  QLegend *legend = m_chart->legend();
                  QAreaSeries *series = new QAreaSeries();
-                 QLineSeries *upper = new QLineSeries();
-                 QLineSeries *lower = new QLineSeries();
+                 QLineSeries *upper = new QLineSeries(series);
+                 QLineSeries *lower = new QLineSeries(series);
                  upper->append(1,1);
                  lower->append(1,0);
                  m_chart->addSeries(line);
                  QAreaSeries *area = new QAreaSeries();
-                 QLineSeries *upper = new QLineSeries();
-                 QLineSeries *lower = new QLineSeries();
+                 QLineSeries *upper = new QLineSeries(area);
+                 QLineSeries *lower = new QLineSeries(area);
                  upper->append(1,1);
                  lower->append(1,0);
                  area->setUpperSeries(upper);
                  markers = legend->markers();
                  QVERIFY(markers.count() == 0);
+                 delete pie;
              }
              void tst_QLegend::pieMarkerProperties()
                  QAreaSeries *area = new QAreaSeries();
                  area->setName(QString("Area"));
-                 QLineSeries *upper = new QLineSeries();
-                 QLineSeries *lower = new QLineSeries();
+                 QLineSeries *upper = new QLineSeries(area);
+                 QLineSeries *lower = new QLineSeries(area);
                  upper->append(1,1);
                  lower->append(1,0);
                  area->setUpperSeries(upper);
                  QAreaSeries *area = new QAreaSeries();
                  area->setName(QString("Area 1"));
-                 QLineSeries *upper = new QLineSeries();
-                 QLineSeries *lower = new QLineSeries();
+                 QLineSeries *upper = new QLineSeries(area);
+                 QLineSeries *lower = new QLineSeries(area);
                  upper->append(2,2);
                  lower->append(1,1);
                  area->setUpperSeries(upper);

tests/auto/qlineseries/tst_qlineseries.cpp +1 0

              void tst_QLineSeries::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QLineSeries::init()

tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp +1 0

              void tst_QLogValueAxis::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QLogValueAxis::init()

tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp +2 0

              void tst_QPercentBarSeries::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QPercentBarSeries::init()
              {
                  QPercentBarSeries *barseries = new QPercentBarSeries();
                  QVERIFY(barseries != 0);
+                 delete barseries;
              }
              void tst_QPercentBarSeries::type_data()

tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp +8 -4

                  QPieSeries *m_series;
                  QChart *m_chart;
+                 QChartView *m_chartView;
              };
              tst_qpiemodelmapper::tst_qpiemodelmapper():
                  m_vMapper(0),
                  m_hMapper(0),
                  m_series(0),
-                 m_chart(0)
+                 m_chart(0),
+                 m_chartView(0)
              {
              }
              void tst_qpiemodelmapper::initTestCase()
              {
                  m_chart = new QChart;
-                 QChartView *chartView = new QChartView(m_chart);
-                 chartView->show();
+                 m_chartView = new QChartView(m_chart);
+                 m_chartView->show();
              }
              void tst_qpiemodelmapper::cleanupTestCase()
              {
-                 //
+                 delete m_chartView;
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_qpiemodelmapper::verticalMapper_data()
                  QCOMPARE(spy4.count(), 1);
                  QCOMPARE(spy5.count(), 1);
+                 delete mapper;
              }
              void tst_qpiemodelmapper::horizontalMapperSignals()

tests/auto/qpieseries/tst_qpieseries.cpp +1 0

              void tst_qpieseries::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_qpieseries::init()

tests/auto/qpieslice/tst_qpieslice.cpp +1 0

              void tst_qpieslice::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_qpieslice::init()

tests/auto/qscatterseries/tst_qscatterseries.cpp +1 0

              void tst_QScatterSeries::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QScatterSeries::init()

tests/auto/qsplineseries/tst_qsplineseries.cpp +1 0

              void tst_QSplineSeries::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QSplineSeries::init()

tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp +2 0

              void tst_QStackedBarSeries::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QStackedBarSeries::init()
              {
                  QStackedBarSeries *barseries = new QStackedBarSeries();
                  QVERIFY(barseries != 0);
+                 delete barseries;
              }
              void tst_QStackedBarSeries::type_data()

tests/auto/qvalueaxis/tst_qvalueaxis.cpp +1 0

              void tst_QValueAxis::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QValueAxis::init()

tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp +10 -4

                  QXYSeries *m_series;
                  QChart *m_chart;
+                 QChartView *m_chartView;
              };
              tst_qxymodelmapper::tst_qxymodelmapper():
                  m_hMapper(0),
                  m_vMapper(0),
                  m_series(0),
-                 m_chart(0)
+                 m_chart(0),
+                 m_chartView(0)
              {
              }
              void tst_qxymodelmapper::initTestCase()
              {
                  m_chart = newQChartOrQPolarChart();
-                 QChartView *chartView = new QChartView(m_chart);
-                 chartView->show();
+                 m_chartView = new QChartView(m_chart);
+                 m_chartView->show();
              }
              void tst_qxymodelmapper::cleanupTestCase()
              {
-                 //
+                 delete m_chartView;
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_qxymodelmapper::verticalMapper_data()
                  QCOMPARE(spy4.count(), 1);
                  QCOMPARE(spy5.count(), 1);
+                 delete mapper;
              }
              void tst_qxymodelmapper::horizontalMapperSignals()
                  QCOMPARE(spy3.count(), 1);
                  QCOMPARE(spy4.count(), 1);
                  QCOMPARE(spy5.count(), 1);
+                 delete mapper;
              }
              QTEST_MAIN(tst_qxymodelmapper)

tests/auto/qxyseries/tst_qxyseries.cpp +1 0

              void tst_QXYSeries::cleanupTestCase()
              {
+                 QTest::qWait(1); // Allow final deleteLaters to run
              }
              void tst_QXYSeries::init()

tests/boxplottester/customtablemodel.cpp +5 0

                  m_data.append(dataVec_Jun);
              }
+             CustomTableModel::~CustomTableModel()
+             {
+                 qDeleteAll(m_data);
+             }
              int CustomTableModel::rowCount(const QModelIndex &parent) const
              {
                  Q_UNUSED(parent)

tests/boxplottester/customtablemodel.h +1 0

                  Q_OBJECT
              public:
                  explicit CustomTableModel(QObject *parent = 0);
+                 virtual ~CustomTableModel();
                  int rowCount(const QModelIndex &parent = QModelIndex()) const;
                  int columnCount(const QModelIndex &parent = QModelIndex()) const;

tests/boxplottester/mainwidget.cpp +1 -1

                  initThemeCombo(grid);
                  initCheckboxes(grid);
-                 m_model = new CustomTableModel();
                  QTableView *tableView = new QTableView;
+                 m_model = new CustomTableModel(tableView);
                  tableView->setModel(m_model);
                  tableView->setMaximumWidth(200);
                  grid->addWidget(tableView, m_rowPos++, 0, 3, 2, Qt::AlignLeft);

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages