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

Add SymbianIDevice

Browse Source 
Change-Id: I0332e6a5e8db6e25a87804c647e920cab537eafe
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2012-03-26 11:15:11 +02:00
parent b439999f1d
commit 5a01a0c157
23 changed files with 1458 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
View File

@@ -41,6 +41,8 @@
#include "s60deploystep.h"
#include "s60runcontrolfactory.h"
#include "s60devicedebugruncontrol.h"
#include "symbianidevice.h"
#include "symbianidevicefactory.h"
#include "qt4symbiantargetfactory.h"
#include "s60publishingwizardfactories.h"
@@ -54,6 +56,7 @@
#include <coreplugin/icore.h>
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/devicesupport/devicemanager.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <debugger/debuggerconstants.h>
#include <utils/qtcassert.h>
@@ -131,8 +134,19 @@ S60Manager::S60Manager(QObject *parent) : QObject(parent)
addAutoReleasedObject(new S60PublishingWizardFactoryOvi);
addAutoReleasedObject(new SymbianQtVersionFactory);
addAutoReleasedObject(new Internal::SymbianIDeviceFactory);
ProjectExplorer::IDevice::Ptr dev(new SymbianIDevice);
ProjectExplorer::DeviceManager::instance()->addDevice(dev);
connect(Core::ICore::mainWindow(), SIGNAL(deviceChange()),
SymbianUtils::SymbianDeviceManager::instance(), SLOT(update()));
SymbianUtils::SymbianDeviceManager *dm = SymbianUtils::SymbianDeviceManager::instance();
connect(dm, SIGNAL(deviceAdded(SymbianUtils::SymbianDevice)),
this, SLOT(symbianDeviceAdded(SymbianUtils::SymbianDevice)));
connect(dm, SIGNAL(deviceRemoved(SymbianUtils::SymbianDevice)),
this, SLOT(symbianDeviceRemoved(SymbianUtils::SymbianDevice)));
}
S60Manager::~S60Manager()
@@ -152,6 +166,34 @@ QString S60Manager::platform(const ProjectExplorer::ToolChain *tc)
return target.right(target.lastIndexOf(QLatin1Char('-')));
}
void S60Manager::symbianDeviceRemoved(const SymbianUtils::SymbianDevice &d)
{
handleSymbianDeviceStateChange(d, ProjectExplorer::IDevice::DeviceUnavailable);
}
void S60Manager::symbianDeviceAdded(const SymbianUtils::SymbianDevice &d)
{
handleSymbianDeviceStateChange(d, ProjectExplorer::IDevice::DeviceAvailable);
}
void S60Manager::handleSymbianDeviceStateChange(const SymbianUtils::SymbianDevice &d, ProjectExplorer::IDevice::AvailabilityState s)
{
ProjectExplorer::DeviceManager *dm = ProjectExplorer::DeviceManager::instance();
for (int i = 0; i < dm->deviceCount(); ++i) {
ProjectExplorer::IDevice::ConstPtr dev = dm->deviceAt(i);
const SymbianIDevice *sdev = dynamic_cast<const SymbianIDevice *>(dev.data());
if (!sdev || sdev->communicationChannel() != SymbianIDevice::CommunicationCodaSerialConnection)
continue;
if (sdev->serialPortName() != d.portName())
continue;
SymbianIDevice *newDev = new SymbianIDevice(*sdev); // Get a new device to replace the current one
newDev->setAvailability(s);
dm->addDevice(ProjectExplorer::IDevice::Ptr(newDev));
break;
}
}
void S60Manager::addAutoReleasedObject(QObject *o)
{
ExtensionSystem::PluginManager::instance()->addObject(o);