Commit 952142ae authored by con's avatar con
Browse files

Add the dummy "run on device" configuration type.

parent abf4cca3
......@@ -34,6 +34,7 @@
#include "winscwtoolchain.h"
#include "gccetoolchain.h"
#include "s60emulatorrunconfiguration.h"
#include "s60Devicerunconfiguration.h"
#include <extensionsystem/pluginmanager.h>
......@@ -52,7 +53,9 @@ S60Manager::S60Manager(QObject *parent)
m_devices(new S60Devices(this)),
m_devicesPreferencePane(new S60DevicesPreferencePane(m_devices, this)),
m_s60EmulatorRunConfigurationFactory(new S60EmulatorRunConfigurationFactory(this)),
m_s60EmulatorRunConfigurationRunner(new S60EmulatorRunConfigurationRunner(this))
m_s60EmulatorRunConfigurationRunner(new S60EmulatorRunConfigurationRunner(this)),
m_s60DeviceRunConfigurationFactory(new S60DeviceRunConfigurationFactory(this)),
m_s60DeviceRunConfigurationRunner(new S60DeviceRunConfigurationRunner(this))
{
m_instance = this;
m_devices->detectQtForDevices();
......@@ -62,6 +65,10 @@ S60Manager::S60Manager(QObject *parent)
->addObject(m_s60EmulatorRunConfigurationFactory);
ExtensionSystem::PluginManager::instance()
->addObject(m_s60EmulatorRunConfigurationRunner);
ExtensionSystem::PluginManager::instance()
->addObject(m_s60DeviceRunConfigurationFactory);
ExtensionSystem::PluginManager::instance()
->addObject(m_s60DeviceRunConfigurationRunner);
updateQtVersions();
connect(m_devices, SIGNAL(qtVersionsChanged()),
this, SLOT(updateQtVersions()));
......@@ -69,6 +76,10 @@ S60Manager::S60Manager(QObject *parent)
S60Manager::~S60Manager()
{
ExtensionSystem::PluginManager::instance()
->removeObject(m_s60DeviceRunConfigurationRunner);
ExtensionSystem::PluginManager::instance()
->removeObject(m_s60DeviceRunConfigurationFactory);
ExtensionSystem::PluginManager::instance()
->removeObject(m_s60EmulatorRunConfigurationRunner);
ExtensionSystem::PluginManager::instance()
......
......@@ -44,6 +44,8 @@ class S60Devices;
class S60DevicesPreferencePane;
class S60EmulatorRunConfigurationFactory;
class S60EmulatorRunConfigurationRunner;
class S60DeviceRunConfigurationFactory;
class S60DeviceRunConfigurationRunner;
class S60Manager : public QObject
{
......@@ -68,6 +70,8 @@ private:
S60DevicesPreferencePane *m_devicesPreferencePane;
S60EmulatorRunConfigurationFactory *m_s60EmulatorRunConfigurationFactory;
S60EmulatorRunConfigurationRunner *m_s60EmulatorRunConfigurationRunner;
S60DeviceRunConfigurationFactory *m_s60DeviceRunConfigurationFactory;
S60DeviceRunConfigurationRunner *m_s60DeviceRunConfigurationRunner;
};
} // namespace Internal
......
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