forked from qt-creator/qt-creator
CppTools: Move QtVersion and BuildTargetType
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:
@@ -29,6 +29,7 @@
|
||||
|
||||
#include "cppprojectfile.h"
|
||||
|
||||
#include <projectexplorer/buildtargettype.h>
|
||||
#include <projectexplorer/headerpath.h>
|
||||
#include <projectexplorer/projectexplorer_global.h>
|
||||
#include <projectexplorer/projectmacro.h>
|
||||
@@ -53,24 +54,11 @@ namespace CppTools {
|
||||
class CPPTOOLS_EXPORT ProjectPart
|
||||
{
|
||||
public:
|
||||
enum QtVersion {
|
||||
UnknownQt = -1,
|
||||
NoQt,
|
||||
Qt4,
|
||||
Qt5
|
||||
};
|
||||
|
||||
enum ToolChainWordWidth {
|
||||
WordWidth32Bit,
|
||||
WordWidth64Bit,
|
||||
};
|
||||
|
||||
enum BuildTargetType {
|
||||
Unknown,
|
||||
Executable,
|
||||
Library
|
||||
};
|
||||
|
||||
using Ptr = QSharedPointer<ProjectPart>;
|
||||
|
||||
public:
|
||||
@@ -97,7 +85,7 @@ public:
|
||||
::Utils::LanguageVersion languageVersion = ::Utils::LanguageVersion::LatestCxx;
|
||||
::Utils::LanguageExtensions languageExtensions = ::Utils::LanguageExtension::None;
|
||||
CPlusPlus::LanguageFeatures languageFeatures;
|
||||
QtVersion qtVersion = UnknownQt;
|
||||
::Utils::QtVersion qtVersion = ::Utils::QtVersion::Unknown;
|
||||
|
||||
// Files
|
||||
ProjectFiles files;
|
||||
@@ -111,7 +99,7 @@ public:
|
||||
|
||||
// Build system
|
||||
QString buildSystemTarget;
|
||||
BuildTargetType buildTargetType = Unknown;
|
||||
ProjectExplorer::BuildTargetType buildTargetType = ProjectExplorer::BuildTargetType::Unknown;
|
||||
bool selectedForBuilding = true;
|
||||
|
||||
// ToolChain
|
||||
|
||||
Reference in New Issue
Block a user