diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-09-07 14:39:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-09-07 14:39:42 +0200 |
| commit | ac9f1f798c1fe99e99c029b5d9e496a410f337ae (patch) | |
| tree | de9a078e8b8256f788a3ac48c5ba63147a4116a5 /tests/auto | |
| parent | b68d943c920bc76506eccdc4b2b08ce93d2f2585 (diff) | |
| parent | 1a64efd863507e47d161c82b2ffbae31c88ed452 (diff) | |
| download | qt-creator-ac9f1f798c1fe99e99c029b5d9e496a410f337ae.tar.gz | |
Merge remote-tracking branch 'origin/4.7'
Change-Id: Ifb51ca9893549c478e99c9fc3ea6c32d5d5a28a2
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/tracing/timelinemodelaggregator/tst_timelinemodelaggregator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/tracing/timelinemodelaggregator/tst_timelinemodelaggregator.cpp b/tests/auto/tracing/timelinemodelaggregator/tst_timelinemodelaggregator.cpp index fedd3dfafa..7a964edb5f 100644 --- a/tests/auto/tracing/timelinemodelaggregator/tst_timelinemodelaggregator.cpp +++ b/tests/auto/tracing/timelinemodelaggregator/tst_timelinemodelaggregator.cpp @@ -65,7 +65,8 @@ void tst_TimelineModelAggregator::height() void tst_TimelineModelAggregator::addRemoveModel() { Timeline::TimelineNotesModel notes; - Timeline::TimelineModelAggregator aggregator(¬es); + Timeline::TimelineModelAggregator aggregator; + aggregator.setNotes(¬es); QSignalSpy spy(&aggregator, SIGNAL(modelsChanged())); QCOMPARE(aggregator.notes(), ¬es); |