Merge lp:~aacid/qtmir/fix_screens_model_test_leak into lp:qtmir

[Albert Astals Cid]

Fix leak in ScreensModelTest

 * Are there any related MPs required for this MP to build/function as expected?
Prereq (well not really but makes for easier testing)

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-18 11:15:56 +0000
+++ CMakeLists.txt	2016-05-25 15:50:19 +0000
@@ -13,6 +13,13 @@
 # Find includes in corresponding build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
+find_package (ECM 1.7.0 QUIET NO_MODULE)
+if (ECM_FOUND)
+    # Provides us with -DECM_ENABLE_SANITIZERS='X'
+    # Where X can be address, thread, memory, leak, undefined
+    include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake")
+endif()
+
 # add custom cmake modules
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 

=== modified file 'tests/mirserver/ScreensModel/screensmodel_test.cpp'
--- tests/mirserver/ScreensModel/screensmodel_test.cpp	2016-04-29 15:41:00 +0000
+++ tests/mirserver/ScreensModel/screensmodel_test.cpp	2016-05-25 15:50:19 +0000
@@ -64,6 +64,7 @@
 void ScreensModelTest::TearDown()
 {
     delete screensModel;
+    delete app;
 }
 
 TEST_F(ScreensModelTest, SingleScreenFound)