From d9357b38ff7686c3aa60e70a1ed2a2219e94cdc4 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@nokia.com>
Date: Tue, 13 Dec 2011 11:02:09 +0100
Subject: [PATCH] Revert "remotelinux: don't double-add plugin to object pool"

Revert the fix of the fix of the fix. Obviously plugins are no longer
automatically added, so we need to do it manually after all.

This reverts commit 795dc8c9ac4dd17a13a5ffa81f03a0cf105ee355.

Change-Id: If1471c6f9ad7271aacd2c2f14e48d7e2afbf778c
Reviewed-by: hjk <qthjk@ovi.com>
---
 src/plugins/remotelinux/remotelinuxplugin.cpp | 6 ++++++
 src/plugins/remotelinux/remotelinuxplugin.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
index e280907a936..920a9f8c7c9 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.cpp
+++ b/src/plugins/remotelinux/remotelinuxplugin.cpp
@@ -73,6 +73,7 @@ bool RemoteLinuxPlugin::initialize(const QStringList &arguments,
 
     LinuxDeviceConfigurations::instance(this);
 
+    addObject(this);
     addAutoReleasedObject(new LinuxDeviceConfigurationsSettingsPage);
     addAutoReleasedObject(new GenericLinuxDeviceConfigurationFactory);
     addAutoReleasedObject(new RemoteLinuxRunConfigurationFactory);
@@ -88,6 +89,11 @@ 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 f55ca766e28..e813c718935 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.h
+++ b/src/plugins/remotelinux/remotelinuxplugin.h
@@ -44,6 +44,7 @@ class RemoteLinuxPlugin : public ExtensionSystem::IPlugin
 
 public:
     RemoteLinuxPlugin();
+    ~RemoteLinuxPlugin();
 
     bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();