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

Fix default names of configutation objects

Browse Source 
Fix default names of project configuration objects on upgrades
from pre 2.0 creators.

Task-number: QTCREATORBUG-3143
This commit is contained in:
Tobias Hunger
2010-11-23 12:17:54 +01:00
parent 66bffd3dcd
commit 3e9eb325a8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/projectconfiguration.cpp
View File

@@ -99,7 +99,9 @@ bool ProjectConfiguration::fromMap(const QVariantMap &map)
{ {
m_id = map.value(QLatin1String(CONFIGURATION_ID_KEY), QString()).toString(); m_id = map.value(QLatin1String(CONFIGURATION_ID_KEY), QString()).toString();
m_displayName = map.value(QLatin1String(DISPLAY_NAME_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(); return !m_id.isEmpty();
} }