diff options
| author | hjk <hjk@qt.io> | 2021-05-25 16:44:20 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2021-05-27 14:35:05 +0000 |
| commit | 015204a7c3c9003585dd415e4e588559d18b7589 (patch) | |
| tree | 7819291a50afcbe15058324c268eb8d7e21c6a00 /src/plugins/cpptools/cppmodelmanager.cpp | |
| parent | 4786b03594fedf77d48f64deee6c782ce99f5f72 (diff) | |
| download | qt-creator-015204a7c3c9003585dd415e4e588559d18b7589.tar.gz | |
ProjectExplorer: Split Kit::*environment into build and run
They may differ in a containerized setup.
Change-Id: Ib7e60fdd69f56e8e22bad3dfbc246e7de2fe9cd4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index cd53aeddbc..cbddd8f764 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -1287,8 +1287,7 @@ ProjectPart::Ptr CppModelManager::fallbackProjectPart() Utils::FilePath sysroot = SysRootKitAspect::sysRoot(defaultKit); if (sysroot.isEmpty()) sysroot = Utils::FilePath::fromString(defaultTc->sysRoot()); - Utils::Environment env = Utils::Environment::systemEnvironment(); - defaultKit->addToEnvironment(env); + Utils::Environment env = defaultKit->buildEnvironment(); ToolChainInfo tcInfo(defaultTc, sysroot.toString(), env); part->setupToolchainProperties(tcInfo, {}); if (part->language == Language::C) |