Merge remote-tracking branch 'origin/4.1'

Change-Id: I5cacf96b5be4053d3a32a7c2a78fad463b9600d0
2016-08-17 15:14:53 +02:00
parent 5f5d23c389 a7cbae1e4d
commit b43765b3e8
9 changed files with 17 additions and 9 deletions
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -105,6 +105,7 @@ CMakeProject::~CMakeProject()
 {
    setRootProjectNode(nullptr);
    m_codeModelFuture.cancel();
+    qDeleteAll(m_watchedFiles);
    qDeleteAll(m_extraCompilers);
 }