From 60cde65ba8cc4baf54c409d6ae46dce83957cd0f Mon Sep 17 00:00:00 2001
From: David Kaspar <dkaspar@blackberry.com>
Date: Fri, 23 Aug 2013 15:06:48 +0200
Subject: [PATCH] Qnx: BB Device Conf. wizard provides default name if hostname
not found
Change-Id: I66b133d343edee762066a7e2797f9f24073dded2
Reviewed-by: Fanda Vacek <fvacek@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
---
src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
index afd6d2265a2..b4ef2c983aa 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
@@ -254,6 +254,9 @@ void BlackBerryDeviceConfigurationWizardQueryPage::processQueryFinished(int stat
m_holder.devicePin = m_deviceInformation->devicePin();
m_holder.scmBundle = m_deviceInformation->scmBundle();
m_holder.deviceName = m_deviceInformation->hostName();
+ if (m_holder.deviceName.isEmpty())
+ m_holder.deviceName = QLatin1String("BlackBerry at ")
+ + field(QLatin1String(DEVICEHOSTNAME_FIELD_ID)).toString();
m_holder.debugTokenAuthor = m_deviceInformation->debugTokenAuthor();
m_holder.debugTokenValid = m_deviceInformation->debugTokenValid();
m_holder.isSimulator = m_deviceInformation->isSimulator();
--
GitLab