diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-05-03 10:17:21 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2012-05-03 16:45:14 +0200 |
| commit | d485bf749f842c0e1b8165c308f32e8836e72668 (patch) | |
| tree | 7733cd66bf1e2f83f895b086506476e41419138b /src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp | |
| parent | 23e78c71fb50deb1b027097a4a6469157c89f87d (diff) | |
| download | qt-creator-d485bf749f842c0e1b8165c308f32e8836e72668.tar.gz | |
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 <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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 |