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

CppTools: Move QtVersion and BuildTargetType

Browse Source 
QtVersion to utils/cpplanguage_details.h which already contains similar
flags.

BuildTargetType to ProjectExplorer, next to BuildTargetInfo (but not in the
same header to not pull that in everywhere).

Removes dependency on ProjectPart from RawProjectPart.

Change-Id: I5791065e4266f20c2657ee4b1b594df04b238a1c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Eike Ziller
2019-08-28 13:04:16 +02:00
parent a0352f24d0
commit 8452264a18
27 changed files with 107 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cpptools/cpprawprojectpart.h
View File

@@ -26,8 +26,9 @@
#pragma once
#include "cpptools_global.h"
#include "projectpart.h"
#include <projectexplorer/buildtargettype.h>
#include <projectexplorer/projectexplorer_global.h>
#include <projectexplorer/toolchain.h>
#include <utils/cpplanguage_details.h>
@@ -70,14 +71,14 @@ public:
void setPreCompiledHeaders(const QStringList &preCompiledHeaders);
void setBuildSystemTarget(const QString &target);
void setBuildTargetType(ProjectPart::BuildTargetType type);
void setBuildTargetType(ProjectExplorer::BuildTargetType type);
void setSelectedForBuilding(bool yesno);
void setFlagsForC(const RawProjectPartFlags &flags);
void setFlagsForCxx(const RawProjectPartFlags &flags);
void setMacros(const ProjectExplorer::Macros &macros);
void setQtVersion(ProjectPart::QtVersion qtVersion);
void setQtVersion(Utils::QtVersion qtVersion);
public:
QString displayName;
@@ -97,7 +98,7 @@ public:
// Build system
QString buildSystemTarget;
ProjectPart::BuildTargetType buildTargetType = ProjectPart::BuildTargetType::Unknown;
ProjectExplorer::BuildTargetType buildTargetType = ProjectExplorer::BuildTargetType::Unknown;
bool selectedForBuilding = true;
// Flags
@@ -106,7 +107,7 @@ public:
// Misc
ProjectExplorer::Macros projectMacros;
ProjectPart::QtVersion qtVersion = ProjectPart::UnknownQt;
Utils::QtVersion qtVersion = Utils::QtVersion::Unknown;
};
using RawProjectParts = QVector<RawProjectPart>;