Commit ff60fcf2 authored by dt's avatar dt
Browse files

Revert "Revert "Qt4ProjectManager: correctly set parse state on restoring""

This reverts commit ae6dbf36.
parent 667d6456
...@@ -196,6 +196,8 @@ bool MaemoRunConfiguration::fromMap(const QVariantMap &map) ...@@ -196,6 +196,8 @@ bool MaemoRunConfiguration::fromMap(const QVariantMap &map)
SystemEnvironmentBase).toInt()); SystemEnvironmentBase).toInt());
m_remoteMounts->fromMap(map); m_remoteMounts->fromMap(map);
m_validParse = qt4Target()->qt4Project()->validParse(m_proFilePath);
setDefaultDisplayName(defaultDisplayName()); setDefaultDisplayName(defaultDisplayName());
return true; return true;
......
...@@ -237,6 +237,9 @@ bool S60DeviceRunConfiguration::fromMap(const QVariantMap &map) ...@@ -237,6 +237,9 @@ bool S60DeviceRunConfiguration::fromMap(const QVariantMap &map)
return false; return false;
if (!QFileInfo(m_proFilePath).exists()) if (!QFileInfo(m_proFilePath).exists())
return false; return false;
m_validParse = qt4Target()->qt4Project()->validParse(m_proFilePath);
setDefaultDisplayName(tr("%1 on Symbian Device").arg(QFileInfo(m_proFilePath).completeBaseName())); setDefaultDisplayName(tr("%1 on Symbian Device").arg(QFileInfo(m_proFilePath).completeBaseName()));
return RunConfiguration::fromMap(map); return RunConfiguration::fromMap(map);
......
...@@ -179,6 +179,9 @@ bool S60EmulatorRunConfiguration::fromMap(const QVariantMap &map) ...@@ -179,6 +179,9 @@ bool S60EmulatorRunConfiguration::fromMap(const QVariantMap &map)
if (m_proFilePath.isEmpty()) if (m_proFilePath.isEmpty())
return false; return false;
m_validParse = qt4Target()->qt4Project()->validParse(m_proFilePath);
//: S60 emulator run configuration default display name, %1 is base pro-File name //: S60 emulator run configuration default display name, %1 is base pro-File name
setDefaultDisplayName(tr("%1 in Symbian Emulator").arg(QFileInfo(m_proFilePath).completeBaseName())); setDefaultDisplayName(tr("%1 in Symbian Emulator").arg(QFileInfo(m_proFilePath).completeBaseName()));
......
...@@ -530,6 +530,8 @@ bool Qt4RunConfiguration::fromMap(const QVariantMap &map) ...@@ -530,6 +530,8 @@ bool Qt4RunConfiguration::fromMap(const QVariantMap &map)
m_userEnvironmentChanges = Utils::EnvironmentItem::fromStringList(map.value(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY)).toStringList()); 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_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); return RunConfiguration::fromMap(map);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment