From ae6dbf364ba6aa7e407d4b29073346a34097b865 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 29 Oct 2010 15:19:05 +0200
Subject: [PATCH] Revert "Qt4ProjectManager: correctly set parse state on
restoring"
This reverts commit b979d9f15189a2b73fd77b30ccb6652ec213bb55.
---
.../qt4projectmanager/qt-maemo/maemorunconfiguration.cpp | 2 --
.../qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp | 3 ---
.../qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp | 3 ---
src/plugins/qt4projectmanager/qt4runconfiguration.cpp | 2 --
4 files changed, 10 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index 44d237b73f4..6e2ba5e7155 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -196,8 +196,6 @@ bool MaemoRunConfiguration::fromMap(const QVariantMap &map)
SystemEnvironmentBase).toInt());
m_remoteMounts->fromMap(map);
- m_validParse = qt4Target()->qt4Project()->validParse(m_proFilePath);
-
setDefaultDisplayName(defaultDisplayName());
return true;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 1310d4b9036..08221988cf1 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -237,9 +237,6 @@ 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);
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
index b1ae0127b78..85aeb2114f1 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
@@ -179,9 +179,6 @@ 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()));
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index 5c414016d32..17a55e23660 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -530,8 +530,6 @@ 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);
}
--
GitLab