qiurui
/
qtgraphs
mirror of https://github.com/qt/qtgraphs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix autotest crash 

Fixes: QTBUG-129138
Change-Id: I3bf60a4e742b9f2960eff4cc2ed42a51b7eab739
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
This commit is contained in:
Tomi Korpipaa 2024-09-23 11:39:05 +03:00
parent 560b56f80f
commit c12733352f
2 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/graphs2d/qgraphsview_p.h
View File

@ -201,18 +201,10 @@ private:
int getSeriesRendererIndex(QAbstractSeries *series);
AxisRenderer *m_axisRenderer = nullptr;
#ifdef USE_BARGRAPH
BarsRenderer *m_barsRenderer = nullptr;
#endif
#ifdef USE_POINTS
PointRenderer *m_pointRenderer = nullptr;
#endif
#ifdef USE_PIEGRAPH
PieRenderer *m_pieRenderer = nullptr;
#endif
#ifdef USE_AREAGRAPH
AreaRenderer *m_areaRenderer = nullptr;
#endif
QList<QObject *> m_seriesList;
QHash<int, QList<QAbstractSeries *>> m_cleanupSeriesList;
QQuickRectangle *m_backgroundRectangle = nullptr;

38
tests/auto/cpp2dtest/qgaxis-value/tst_valueaxis.cpp
View File

@ -22,8 +22,7 @@ private slots:
void initialProperties();
void initializeProperties();
void invalidProperties();
// TODO: Crashes -> QTBUG-129138
// void addAndDelete();
void addAndDelete();
private:
QValueAxis *m_axis;
@ -113,24 +112,23 @@ void tst_valueaxis::invalidProperties()
QCOMPARE(m_axis->subTickCount(), 0);
}
// TODO: Crashes -> QTBUG-129138
// void tst_valueaxis::addAndDelete()
// {
// QValueAxis *xAxis = new QValueAxis();
// QValueAxis *yAxis = new QValueAxis();
// QGraphsView view;
// view.setAxisX(xAxis);
// view.setAxisY(yAxis);
// QVERIFY(view.axisX());
// QVERIFY(view.axisY());
// // Axis destructors should remove them from the GraphsView
// delete xAxis;
// QVERIFY(!view.axisX());
// QVERIFY(view.axisY());
// delete yAxis;
// QVERIFY(!view.axisX());
// QVERIFY(!view.axisY());
// }
void tst_valueaxis::addAndDelete()
{
QValueAxis *xAxis = new QValueAxis();
QValueAxis *yAxis = new QValueAxis();
QGraphsView view;
view.setAxisX(xAxis);
view.setAxisY(yAxis);
QVERIFY(view.axisX());
QVERIFY(view.axisY());
// Axis destructors should remove them from the GraphsView
delete xAxis;
QVERIFY(!view.axisX());
QVERIFY(view.axisY());
delete yAxis;
QVERIFY(!view.axisX());
QVERIFY(!view.axisY());
}
QTEST_MAIN(tst_valueaxis)
#include "tst_valueaxis.moc"