From 3e9eb325a81254af0528522eab84d89905e226ce Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 23 Nov 2010 12:17:54 +0100
Subject: [PATCH] Fix default names of configutation objects
Fix default names of project configuration objects on upgrades
from pre 2.0 creators.
Task-number: QTCREATORBUG-3143
---
src/plugins/projectexplorer/projectconfiguration.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/projectexplorer/projectconfiguration.cpp b/src/plugins/projectexplorer/projectconfiguration.cpp
index fb27a64b368..18118c72f2c 100644
--- a/src/plugins/projectexplorer/projectconfiguration.cpp
+++ b/src/plugins/projectexplorer/projectconfiguration.cpp
@@ -99,7 +99,9 @@ bool ProjectConfiguration::fromMap(const QVariantMap &map)
{
m_id = map.value(QLatin1String(CONFIGURATION_ID_KEY), QString()).toString();
m_displayName = map.value(QLatin1String(DISPLAY_NAME_KEY), QString()).toString();
- m_defaultDisplayName = map.value(QLatin1String(DEFAULT_DISPLAY_NAME_KEY), m_displayName).toString();
+ m_defaultDisplayName = map.value(QLatin1String(DEFAULT_DISPLAY_NAME_KEY),
+ m_defaultDisplayName.isEmpty() ?
+ m_displayName : m_defaultDisplayName).toString();
return !m_id.isEmpty();
}
--
GitLab