From 05f29012d924568fa18d2d86581fd6ba734d5462 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@nokia.com>
Date: Fri, 23 Oct 2009 18:40:46 +0200
Subject: [PATCH] S60: Deleting allocated TrkLauncher in dtor of
S60DeviceRunControlBase.
---
.../qt-s60/s60devicerunconfiguration.cpp | 8 ++++++++
.../qt4projectmanager/qt-s60/s60devicerunconfiguration.h | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 9ab5d93b3b7..d547c3b6d83 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -435,6 +435,14 @@ S60DeviceRunControlBase::S60DeviceRunControlBase(const QSharedPointer<RunConfigu
m_packageFile = QFileInfo(m_packageFilePath).fileName();
}
+S60DeviceRunControlBase::~S60DeviceRunControlBase()
+{
+ if (m_launcher) {
+ m_launcher->deleteLater();
+ m_launcher = 0;
+ }
+}
+
void S60DeviceRunControlBase::start()
{
emit started();
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
index 1efaca48f4a..444e8855f65 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
@@ -129,7 +129,7 @@ class S60DeviceRunControlBase : public ProjectExplorer::RunControl
Q_OBJECT
public:
explicit S60DeviceRunControlBase(const QSharedPointer<ProjectExplorer::RunConfiguration> &runConfiguration);
- ~S60DeviceRunControlBase() {}
+ ~S60DeviceRunControlBase();
virtual void start();
virtual void stop();
virtual bool isRunning() const;
--
GitLab