feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "remotelinux: don't double-add plugin to object pool"

Browse Source 
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 795dc8c9ac.

Change-Id: If1471c6f9ad7271aacd2c2f14e48d7e2afbf778c
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Eike Ziller
2011-12-13 11:02:09 +01:00
committed by hjk
parent 02470b35c5
commit d9357b38ff
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/remotelinux/remotelinuxplugin.cpp
View File

@@ -73,6 +73,7 @@ bool RemoteLinuxPlugin::initialize(const QStringList &arguments,
LinuxDeviceConfigurations::instance(this); LinuxDeviceConfigurations::instance(this);
addObject(this);
addAutoReleasedObject(new LinuxDeviceConfigurationsSettingsPage); addAutoReleasedObject(new LinuxDeviceConfigurationsSettingsPage);
addAutoReleasedObject(new GenericLinuxDeviceConfigurationFactory); addAutoReleasedObject(new GenericLinuxDeviceConfigurationFactory);
addAutoReleasedObject(new RemoteLinuxRunConfigurationFactory); addAutoReleasedObject(new RemoteLinuxRunConfigurationFactory);
@@ -88,6 +89,11 @@ bool RemoteLinuxPlugin::initialize(const QStringList &arguments,
return true; return true;
} }
RemoteLinuxPlugin::~RemoteLinuxPlugin()
{
removeObject(this);
}
void RemoteLinuxPlugin::extensionsInitialized() void RemoteLinuxPlugin::extensionsInitialized()
{ {
/* /*

1
src/plugins/remotelinux/remotelinuxplugin.h
View File

@@ -44,6 +44,7 @@ class RemoteLinuxPlugin : public ExtensionSystem::IPlugin
public: public:
RemoteLinuxPlugin(); RemoteLinuxPlugin();
~RemoteLinuxPlugin();
bool initialize(const QStringList &arguments, QString *errorMessage); bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized(); void extensionsInitialized();