Commit d9357b38 authored by Eike Ziller's avatar Eike Ziller Committed by hjk
Browse files

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 795dc8c9

.

Change-Id: If1471c6f9ad7271aacd2c2f14e48d7e2afbf778c
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 02470b35
......@@ -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()
{
/*
......
......@@ -44,6 +44,7 @@ class RemoteLinuxPlugin : public ExtensionSystem::IPlugin
public:
RemoteLinuxPlugin();
~RemoteLinuxPlugin();
bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment