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

11
src/plugins/projectexplorer/project.cpp
View File

@@ -48,8 +48,9 @@
#include <projectexplorer/kitmanager.h>
#include <projectexplorer/projecttree.h>
#include <utils/pointeralgorithm.h>
#include <utils/environment.h>
#include <utils/macroexpander.h>
#include <utils/pointeralgorithm.h>
#include <utils/qtcassert.h>
#include <QFileDialog>
@@ -811,6 +812,14 @@ Task Project::createProjectTask(Task::TaskType type, const QString &description)
return Task(type, description, Utils::FilePath(), -1, Core::Id());
}
Utils::Environment Project::activeBuildEnvironment() const
{
const BuildConfiguration * const buildConfiguration = activeTarget()
? activeTarget()->activeBuildConfiguration() : nullptr;
return buildConfiguration ? buildConfiguration->environment()
: Utils::Environment::systemEnvironment();
}
Core::Context Project::projectContext() const
{
return Core::Context(d->m_id);