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

CppTools: Move ProjectUpdateInfo to ProjectExplorer

Browse Source 
Used for updating project parts, so move it near RawProjectPart.

Change-Id: I77aeffbdbfb3d2ec0de600f61dcf7fbb7a355a98
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Eike Ziller
2019-08-29 09:59:45 +02:00
parent 295fb99cc6
commit ed9177f74c
17 changed files with 147 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/cpptools/projectinfo.h
View File

@@ -40,50 +40,6 @@
namespace CppTools {
class KitInfo;
class ToolChainInfo
{
public:
ToolChainInfo() = default;
ToolChainInfo(const ProjectExplorer::ToolChain *toolChain,
const QString &sysRootPath, const Utils::Environment &env);
bool isValid() const { return type.isValid(); }
public:
Core::Id type;
bool isMsvc2015ToolChain = false;
unsigned wordWidth = 0;
QString targetTriple;
QStringList extraCodeModelFlags;
QString sysRootPath; // For headerPathsRunner.
ProjectExplorer::ToolChain::BuiltInHeaderPathsRunner headerPathsRunner;
ProjectExplorer::ToolChain::MacroInspectionRunner macroInspectionRunner;
};
class CPPTOOLS_EXPORT ProjectUpdateInfo
{
public:
ProjectUpdateInfo() = default;
ProjectUpdateInfo(ProjectExplorer::Project *project,
const KitInfo &kitInfo,
const Utils::Environment &env,
const ProjectExplorer::RawProjectParts &rawProjectParts);
bool isValid() const { return project && !rawProjectParts.isEmpty(); }
public:
QPointer<ProjectExplorer::Project> project;
ProjectExplorer::RawProjectParts rawProjectParts;
const ProjectExplorer::ToolChain *cToolChain = nullptr;
const ProjectExplorer::ToolChain *cxxToolChain = nullptr;
ToolChainInfo cToolChainInfo;
ToolChainInfo cxxToolChainInfo;
};
class CPPTOOLS_EXPORT ProjectInfo
{
public: