diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 47fd5cc428f..f3599f6f4ea 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -484,12 +484,11 @@ void QbsProject::readQbsData() m_rootProjectNode->update(); - qbs::Project project = m_rootProjectNode->qbsProject(); - updateDocuments(project.isValid() ? project.buildSystemFiles() : QSet() << m_fileName); + updateDocuments(m_qbsProject.isValid() + ? m_qbsProject.buildSystemFiles() : QSet() << m_fileName); - qbs::ProjectData data = m_rootProjectNode->qbsProjectData(); - updateCppCodeModel(data); - updateQmlJsCodeModel(data); + updateCppCodeModel(); + updateQmlJsCodeModel(); updateBuildTargetData(); emit fileListChanged(); @@ -654,9 +653,9 @@ void QbsProject::updateDocuments(const QSet &files) m_qbsDocuments.unite(toAdd); } -void QbsProject::updateCppCodeModel(const qbs::ProjectData &prj) +void QbsProject::updateCppCodeModel() { - if (!prj.isValid()) + if (!m_projectData.isValid()) return; QtSupport::BaseQtVersion *qtVersion = @@ -683,7 +682,7 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData &prj) } QHash uiFiles; - foreach (const qbs::ProductData &prd, prj.allProducts()) { + foreach (const qbs::ProductData &prd, m_projectData.allProducts()) { foreach (const qbs::GroupData &grp, prd.groups()) { const qbs::PropertyMap &props = grp.properties(); @@ -764,9 +763,8 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData &prj) m_codeModelFuture = modelmanager->updateProjectInfo(pinfo); } -void QbsProject::updateQmlJsCodeModel(const qbs::ProjectData &prj) +void QbsProject::updateQmlJsCodeModel() { - Q_UNUSED(prj); QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance(); if (!modelManager) return; diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h index b3a94871003..ceaf7916394 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.h +++ b/src/plugins/qbsprojectmanager/qbsproject.h @@ -133,8 +133,8 @@ private: void prepareForParsing(); void updateDocuments(const QSet &files); - void updateCppCodeModel(const qbs::ProjectData &prj); - void updateQmlJsCodeModel(const qbs::ProjectData &prj); + void updateCppCodeModel(); + void updateQmlJsCodeModel(); void updateApplicationTargets(); void updateDeploymentInfo(); void updateBuildTargetData();