From d485bf749f842c0e1b8165c308f32e8836e72668 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 3 May 2012 10:17:21 +0200 Subject: Symbian: Don't switch to default device in clone constructor m_deviceId will already be set in S60DeployConfiguration(Target *target, S60DeployConfiguration *source). Change-Id: I78402e3c86fe5f87062b9594c7f8e53e5e03755e Reviewed-by: Tobias Hunger --- .../qt4projectmanager/qt-s60/s60deployconfiguration.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp') diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp index 72c78ec976..6b7f323378 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp @@ -86,6 +86,12 @@ S60DeployConfiguration::S60DeployConfiguration(Target *parent) : m_silentInstall(true) { ctor(); + + ProjectExplorer::DeviceManager *dm = ProjectExplorer::DeviceManager::instance(); + IDevice::ConstPtr defaultDevice + = dm->defaultDevice(Internal::SymbianIDeviceFactory::deviceType()); + if (defaultDevice) + m_deviceId = defaultDevice->id(); } S60DeployConfiguration::S60DeployConfiguration(Target *target, S60DeployConfiguration *source) : @@ -100,12 +106,6 @@ S60DeployConfiguration::S60DeployConfiguration(Target *target, S60DeployConfigur void S60DeployConfiguration::ctor() { - ProjectExplorer::DeviceManager *dm = ProjectExplorer::DeviceManager::instance(); - IDevice::ConstPtr defaultDevice - = dm->defaultDevice(Internal::SymbianIDeviceFactory::deviceType()); - if (defaultDevice) - m_deviceId = defaultDevice->id(); - setDefaultDisplayName(defaultDisplayName()); // TODO disable S60 Deploy Configuration while parsing // requires keeping track of the parsing state of the project -- cgit v1.2.1