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

Device support: Don't create a Core::Id object with an empty string.

Browse Source 
Otherwise we get ugly assertions.

Change-Id: I393e827dae51dcb07e1e554c6dfff0d7b639864c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Christian Kandeler
2012-04-27 17:19:00 +02:00
parent 89c60eee39
commit fbbbba1dba
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
View File

@@ -103,8 +103,8 @@ bool RemoteLinuxDeployConfiguration::fromMap(const QVariantMap &map)
{ {
if (!DeployConfiguration::fromMap(map)) if (!DeployConfiguration::fromMap(map))
return false; return false;
setDeviceConfig(Core::Id(map.value(QLatin1String(DeviceIdKey), const QString idString = map.value(QLatin1String(DeviceIdKey)).toString();
IDevice::invalidId().toString()).toString())); setDeviceConfig(!idString.isEmpty() ? Core::Id(idString) : IDevice::invalidId());
return true; return true;
} }