feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Make the project managers tell the code model about include paths

Browse Source 
... from the environment.

Fixes: QTCREATORBUG-17985
Change-Id: I9b54e550121cfcc0684a6e173337d59d235c6107
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Christian Kandeler
2019-07-05 16:58:07 +02:00
parent 6e1595c1b3
commit f7520b7d99
35 changed files with 168 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -533,6 +533,8 @@ void QbsProject::handleQbsParsingDone(bool success)
m_qbsProject = m_qbsProjectParser->qbsProject();
m_qbsProjects.insert(activeTarget(), m_qbsProject);
bool dataChanged = false;
bool envChanged = m_lastParseEnv != m_qbsProjectParser->environment();
m_lastParseEnv = m_qbsProjectParser->environment();
if (success) {
QTC_ASSERT(m_qbsProject.isValid(), return);
const qbs::ProjectData &projectData = m_qbsProject.projectData();
@@ -552,6 +554,8 @@ void QbsProject::handleQbsParsingDone(bool success)
if (dataChanged)
updateAfterParse();
else if (envChanged)
updateCppCodeModel();
emitParsingFinished(success);
}
@@ -1085,7 +1089,7 @@ void QbsProject::updateCppCodeModel()
}
CppTools::GeneratedCodeModelSupport::update(m_extraCompilers);
m_cppCodeModelUpdater->update({this, kitInfo, rpps});
m_cppCodeModelUpdater->update({this, kitInfo, activeBuildEnvironment(), rpps});
}
void QbsProject::updateQmlJsCodeModel()