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

Qt4ProjectManager: correctly set parse state on restoring

Browse Source
This commit is contained in:
dt
2010-10-29 12:16:30 +02:00
parent 0a5202d299
commit b979d9f151
4 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View File

@@ -196,6 +196,8 @@ bool MaemoRunConfiguration::fromMap(const QVariantMap &map)
SystemEnvironmentBase).toInt());
m_remoteMounts->fromMap(map);
m_validParse = qt4Target()->qt4Project()->validParse(m_proFilePath);
setDefaultDisplayName(defaultDisplayName());
return true;

3
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -237,6 +237,9 @@ bool S60DeviceRunConfiguration::fromMap(const QVariantMap &map)
return false;
if (!QFileInfo(m_proFilePath).exists())
return false;
m_validParse = qt4Target()->qt4Project()->validParse(m_proFilePath);
setDefaultDisplayName(tr("%1 on Symbian Device").arg(QFileInfo(m_proFilePath).completeBaseName()));
return RunConfiguration::fromMap(map);

3
src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
View File

@@ -179,6 +179,9 @@ bool S60EmulatorRunConfiguration::fromMap(const QVariantMap &map)
if (m_proFilePath.isEmpty())
return false;
m_validParse = qt4Target()->qt4Project()->validParse(m_proFilePath);
//: S60 emulator run configuration default display name, %1 is base pro-File name
setDefaultDisplayName(tr("%1 in Symbian Emulator").arg(QFileInfo(m_proFilePath).completeBaseName()));

2
src/plugins/qt4projectmanager/qt4runconfiguration.cpp
View File

@@ -527,6 +527,8 @@ bool Qt4RunConfiguration::fromMap(const QVariantMap &map)
m_userEnvironmentChanges = Utils::EnvironmentItem::fromStringList(map.value(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY)).toStringList());
m_baseEnvironmentBase = static_cast<BaseEnvironmentBase>(map.value(QLatin1String(BASE_ENVIRONMENT_BASE_KEY), static_cast<int>(Qt4RunConfiguration::BuildEnvironmentBase)).toInt());
m_parseSuccess = qt4Target()->qt4Project()->validParse(m_proFilePath);
return RunConfiguration::fromMap(map);
}