From ebf3baccc29e625bd805c08ce74ab23bef0a8595 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Fri, 28 Aug 2015 13:04:29 +1000 Subject: [PATCH] Fix leaks in tests --- tests/src/core/testqgscomposermultiframe.cpp | 1 + tests/src/core/testqgscomposertablev2.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/src/core/testqgscomposermultiframe.cpp b/tests/src/core/testqgscomposermultiframe.cpp index b81134fee24..58d48e3dda3 100644 --- a/tests/src/core/testqgscomposermultiframe.cpp +++ b/tests/src/core/testqgscomposermultiframe.cpp @@ -98,6 +98,7 @@ void TestQgsComposerMultiFrame::addFrame() { QgsComposerHtml* htmlItem = new QgsComposerHtml( mComposition, false ); QgsComposerFrame* frame1 = new QgsComposerFrame( mComposition, htmlItem, 0, 0, 100, 200 ); + htmlItem->addFrame( frame1 ); //should not be inherited frame1->setHidePageIfEmpty( true ); diff --git a/tests/src/core/testqgscomposertablev2.cpp b/tests/src/core/testqgscomposertablev2.cpp index 20cdaa3c6cc..53ce405e7f9 100644 --- a/tests/src/core/testqgscomposertablev2.cpp +++ b/tests/src/core/testqgscomposertablev2.cpp @@ -619,10 +619,10 @@ void TestQgsComposerTableV2::removeDuplicates() //check if removing attributes in unique mode works correctly (should result in duplicate rows, //which will be stripped out) - table->columns()->removeLast(); + delete table->columns()->takeLast(); table->refreshAttributes(); QCOMPARE( table->contents()->length(), 2 ); - table->columns()->removeLast(); + delete table->columns()->takeLast(); table->refreshAttributes(); QCOMPARE( table->contents()->length(), 1 ); table->setUniqueRowsOnly( false );