aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@digia.com>2014-03-27 15:44:22 +0100
committerTobias Hunger <tobias.hunger@digia.com>2014-03-27 15:45:58 +0100
commit7d2e5d54a1818b9f5fed75526ad58593929224c2 (patch)
tree3f98650775cdbd96f3101753faa24b68ceab0720
parent00c0fcf35376445384673b7c2982120eab1c866e (diff)
Qbs: Send parsing done even if the parsing actually failed
Task-number: QTCREATORBUG-11876 Change-Id: I9c52df7d0ebcb7f779e22061e5cf7923c09dab14 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
-rw-r--r--src/plugins/qbsprojectmanager/qbsproject.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index b264cd2f6c..59bf6d1dd7 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -297,22 +297,22 @@ void QbsProject::handleQbsParsingDone(bool success)
delete m_qbsUpdateFutureInterface;
m_qbsUpdateFutureInterface = 0;
- if (!project.isValid())
- return;
+ if (project.isValid()) {
+ // Do not throw away data when parsing errors were introduced. That frightens users:-)
+ m_rootProjectNode->update(project);
- m_rootProjectNode->update(project);
+ updateDocuments(project.isValid() ? project.buildSystemFiles() : QSet<QString>() << m_fileName);
- updateDocuments(project.isValid() ? project.buildSystemFiles() : QSet<QString>() << m_fileName);
+ updateCppCodeModel(m_rootProjectNode->qbsProjectData());
+ updateQmlJsCodeModel(m_rootProjectNode->qbsProjectData());
+ updateApplicationTargets(m_rootProjectNode->qbsProjectData());
+ updateDeploymentInfo(m_rootProjectNode->qbsProject());
- updateCppCodeModel(m_rootProjectNode->qbsProjectData());
- updateQmlJsCodeModel(m_rootProjectNode->qbsProjectData());
- updateApplicationTargets(m_rootProjectNode->qbsProjectData());
- updateDeploymentInfo(m_rootProjectNode->qbsProject());
+ foreach (Target *t, targets())
+ t->updateDefaultRunConfigurations();
- foreach (Target *t, targets())
- t->updateDefaultRunConfigurations();
-
- emit fileListChanged();
+ emit fileListChanged();
+ }
emit projectParsingDone(success);
}