From f7684f689e43d659dcbf6e634d744b92574a0211 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Tue, 13 Mar 2012 15:44:59 +0100
Subject: [PATCH] Qt4project: Fix crash on changing a .pro file in particular
ways
Reported on irc by ckandler
Change-Id: I96133c708e05a8c05d48d67fbcd05637f2a1e241
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
src/plugins/qt4projectmanager/qt4nodes.cpp | 5 +++++
src/plugins/qt4projectmanager/qt4nodes.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 766519ee10e..002eb5fd1ae 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -257,6 +257,11 @@ Qt4PriFileNode::Qt4PriFileNode(Qt4Project *project, Qt4ProFileNode* qt4ProFileNo
setIcon(qt4NodeStaticData()->projectIcon);
}
+Qt4PriFileNode::~Qt4PriFileNode()
+{
+ watchFolders(QSet<QString>());
+}
+
void Qt4PriFileNode::scheduleUpdate()
{
QtSupport::ProFileCacheManager::instance()->discardFile(m_projectFilePath);
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index dfaec5e67b2..8df585e1acb 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -129,6 +129,7 @@ class QT4PROJECTMANAGER_EXPORT Qt4PriFileNode : public ProjectExplorer::ProjectN
public:
Qt4PriFileNode(Qt4Project *project, Qt4ProFileNode* qt4ProFileNode, const QString &filePath);
+ ~Qt4PriFileNode();
void update(ProFile *includeFileExact, QtSupport::ProFileReader *readerExact, ProFile *includeFileCumlative, QtSupport::ProFileReader *readerCumalative);
--
GitLab