From ea9c5efa15f58ac40160a92ec305286eab3b9809 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 14 Jan 2010 21:39:31 +0100
Subject: [PATCH] save possible modifications to pro file *before* re-reading
it ...
---
src/plugins/qt4projectmanager/qt4nodes.cpp | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 99283fee0bd..bd89e399afe 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -631,6 +631,12 @@ void Qt4PriFileNode::changeFiles(const FileType fileType,
if (filePaths.isEmpty())
return;
+ *notChanged = filePaths;
+
+ // Check for modified editors
+ if (!saveModifiedEditors(m_projectFilePath))
+ return;
+
ProFileReader *reader = m_project->createProFileReader(m_qt4ProFileNode);
if (!reader->readProFile(m_qt4ProFileNode->path())) {
m_project->proFileParseError(tr("Error while parsing file %1. Giving up.").arg(m_projectFilePath));
@@ -643,14 +649,6 @@ void Qt4PriFileNode::changeFiles(const FileType fileType,
m_project->proFileParseError(tr("Error while changing pro file %1.").arg(m_projectFilePath));
}
- *notChanged = filePaths;
-
- // Check for modified editors
- if (!saveModifiedEditors(m_projectFilePath)) {
- m_project->destroyProFileReader(reader);
- return;
- }
-
const QStringList vars = varNames(fileType);
QDir priFileDir = QDir(m_projectDir);
--
GitLab