summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/projectinfo.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-08-29 09:59:45 +0200
committerEike Ziller <eike.ziller@qt.io>2019-09-12 06:37:41 +0000
commited9177f74cf5da5eda3d2bc670ef883b66ee9a9b (patch)
tree439123496d84c84e0977fb03034ccfea4299ff17 /src/plugins/cpptools/projectinfo.cpp
parent295fb99cc64243458832a3352b01707488324a6e (diff)
downloadqt-creator-ed9177f74cf5da5eda3d2bc670ef883b66ee9a9b.tar.gz
CppTools: Move ProjectUpdateInfo to ProjectExplorer
Used for updating project parts, so move it near RawProjectPart. Change-Id: I77aeffbdbfb3d2ec0de600f61dcf7fbb7a355a98 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/cpptools/projectinfo.cpp')
-rw-r--r--src/plugins/cpptools/projectinfo.cpp38
1 files changed, 2 insertions, 36 deletions
diff --git a/src/plugins/cpptools/projectinfo.cpp b/src/plugins/cpptools/projectinfo.cpp
index 9c6428f258..a7047dc972 100644
--- a/src/plugins/cpptools/projectinfo.cpp
+++ b/src/plugins/cpptools/projectinfo.cpp
@@ -25,48 +25,14 @@
#include "projectinfo.h"
-#include "cppkitinfo.h"
-
#include <projectexplorer/abi.h>
-#include <projectexplorer/toolchain.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/rawprojectpart.h>
+#include <projectexplorer/toolchain.h>
namespace CppTools {
-ToolChainInfo::ToolChainInfo(const ProjectExplorer::ToolChain *toolChain,
- const QString &sysRootPath, const Utils::Environment &env)
-{
- if (toolChain) {
- // Keep the following cheap/non-blocking for the ui thread...
- type = toolChain->typeId();
- isMsvc2015ToolChain
- = toolChain->targetAbi().osFlavor() == ProjectExplorer::Abi::WindowsMsvc2015Flavor;
- wordWidth = toolChain->targetAbi().wordWidth();
- targetTriple = toolChain->originalTargetTriple();
- extraCodeModelFlags = toolChain->extraCodeModelFlags();
-
- // ...and save the potentially expensive operations for later so that
- // they can be run from a worker thread.
- this->sysRootPath = sysRootPath;
- headerPathsRunner = toolChain->createBuiltInHeaderPathsRunner(env);
- macroInspectionRunner = toolChain->createMacroInspectionRunner();
- }
-}
-
-ProjectUpdateInfo::ProjectUpdateInfo(ProjectExplorer::Project *project,
- const KitInfo &kitInfo,
- const Utils::Environment &env,
- const ProjectExplorer::RawProjectParts &rawProjectParts)
- : project(project)
- , rawProjectParts(rawProjectParts)
- , cToolChain(kitInfo.cToolChain)
- , cxxToolChain(kitInfo.cxxToolChain)
- , cToolChainInfo(ToolChainInfo(cToolChain, kitInfo.sysRootPath, env))
- , cxxToolChainInfo(ToolChainInfo(cxxToolChain, kitInfo.sysRootPath, env))
-{
-}
-
ProjectInfo::ProjectInfo(QPointer<ProjectExplorer::Project> project)
: m_project(project)
{