From 795dc8c9ac4dd17a13a5ffa81f03a0cf105ee355 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 8 Dec 2011 17:53:32 +0100
Subject: [PATCH] remotelinux: don't double-add plugin to object pool
Change-Id: Idf544a69aa13d5fbdaefef1e485824b1d00fd08b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
---
src/plugins/remotelinux/remotelinuxplugin.cpp | 6 ------
src/plugins/remotelinux/remotelinuxplugin.h | 1 -
2 files changed, 7 deletions(-)
diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
index 920a9f8c7c9..e280907a936 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.cpp
+++ b/src/plugins/remotelinux/remotelinuxplugin.cpp
@@ -73,7 +73,6 @@ bool RemoteLinuxPlugin::initialize(const QStringList &arguments,
LinuxDeviceConfigurations::instance(this);
- addObject(this);
addAutoReleasedObject(new LinuxDeviceConfigurationsSettingsPage);
addAutoReleasedObject(new GenericLinuxDeviceConfigurationFactory);
addAutoReleasedObject(new RemoteLinuxRunConfigurationFactory);
@@ -89,11 +88,6 @@ bool RemoteLinuxPlugin::initialize(const QStringList &arguments,
return true;
}
-RemoteLinuxPlugin::~RemoteLinuxPlugin()
-{
- removeObject(this);
-}
-
void RemoteLinuxPlugin::extensionsInitialized()
{
/*
diff --git a/src/plugins/remotelinux/remotelinuxplugin.h b/src/plugins/remotelinux/remotelinuxplugin.h
index e813c718935..f55ca766e28 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.h
+++ b/src/plugins/remotelinux/remotelinuxplugin.h
@@ -44,7 +44,6 @@ class RemoteLinuxPlugin : public ExtensionSystem::IPlugin
public:
RemoteLinuxPlugin();
- ~RemoteLinuxPlugin();
bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
--
GitLab