From fbbbba1dbad813dfb79ee5d0ea6b2e881d6e2161 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Fri, 27 Apr 2012 17:19:00 +0200
Subject: [PATCH] Device support: Don't create a Core::Id object with an empty
 string.

Otherwise we get ugly assertions.

Change-Id: I393e827dae51dcb07e1e554c6dfff0d7b639864c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
---
 src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
index 5999bb09ebd..788777f5912 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
@@ -103,8 +103,8 @@ bool RemoteLinuxDeployConfiguration::fromMap(const QVariantMap &map)
 {
     if (!DeployConfiguration::fromMap(map))
         return false;
-    setDeviceConfig(Core::Id(map.value(QLatin1String(DeviceIdKey),
-            IDevice::invalidId().toString()).toString()));
+    const QString idString = map.value(QLatin1String(DeviceIdKey)).toString();
+    setDeviceConfig(!idString.isEmpty() ? Core::Id(idString) : IDevice::invalidId());
     return true;
 }