summaryrefslogtreecommitdiff
path: root/src/plugins/qbsprojectmanager
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@digia.com>2014-06-24 16:10:55 +0200
committerTobias Hunger <tobias.hunger@digia.com>2014-06-24 16:14:42 +0200
commitc3f8346b9b775de2f18be4e3e8db279b574cb3a3 (patch)
tree234ee28cbd519fc864cdac631f631c674d7c2094 /src/plugins/qbsprojectmanager
parent38b8940bd4531071ddc395fa7b29d5f364b53b3a (diff)
downloadqt-creator-c3f8346b9b775de2f18be4e3e8db279b574cb3a3.tar.gz
Qbs: Avoid crash when asking for qbs::ProjectData on invalid Project
Change-Id: I2ce060ab0017eb7722b6dc4f64b1e536f139952c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/qbsprojectmanager')
-rw-r--r--src/plugins/qbsprojectmanager/qbsnodes.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsnodes.cpp b/src/plugins/qbsprojectmanager/qbsnodes.cpp
index e2f96cef12..3dfc8d84bd 100644
--- a/src/plugins/qbsprojectmanager/qbsnodes.cpp
+++ b/src/plugins/qbsprojectmanager/qbsnodes.cpp
@@ -834,7 +834,10 @@ const qbs::Project QbsProjectNode::qbsProject() const
const qbs::ProjectData QbsProjectNode::qbsProjectData() const
{
- return m_qbsProject.projectData();
+ if (m_qbsProject.isValid())
+ return m_qbsProject.projectData();
+ else
+ return qbs::ProjectData();
}
bool QbsProjectNode::showInSimpleTree() const