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

GenericProject: put different languages into separate project parts.

Browse Source 
This is in preparation for changes to the ProjectParts, where one part
can only hold files for 1 language.

Change-Id: I5e9a1a803ecc3ecbb36added0d0094df63922549
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Erik Verbruggen
2014-06-18 16:16:55 +02:00
committed by Nikolai Kosjar
parent bb8575c60c
commit 876ea282d2
24 changed files with 479 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/plugins/cpptools/cppprojects.h
View File

@@ -43,18 +43,7 @@ namespace CppTools {
class CPPTOOLS_EXPORT ProjectPart
{
public:
typedef QSharedPointer<ProjectPart> Ptr;
public:
ProjectPart();
void evaluateToolchain(const ProjectExplorer::ToolChain *tc,
const QStringList &cxxflags,
const QStringList &cflags,
const Utils::FileName &sysRoot);
public:
public: // Types
enum CVersion {
C89,
C99,
@@ -84,11 +73,12 @@ public:
Qt5 = 2
};
class HeaderPath
{
public:
typedef QSharedPointer<ProjectPart> Ptr;
struct HeaderPath {
enum Type { InvalidPath, IncludePath, FrameworkPath };
public:
QString path;
Type type;
@@ -106,10 +96,19 @@ public:
};
typedef QList<HeaderPath> HeaderPaths;
public:
public: // methods
ProjectPart();
void evaluateToolchain(const ProjectExplorer::ToolChain *tc,
const QStringList &cxxflags,
const QStringList &cflags,
const Utils::FileName &sysRoot);
Ptr copy() const;
static QByteArray readProjectConfigFile(const ProjectPart::Ptr &part);
public:
public: // fields
QString displayName;
QString projectFile;
ProjectExplorer::Project *project;
@@ -159,6 +158,34 @@ private:
QByteArray m_defines;
};
class CPPTOOLS_EXPORT ProjectPartBuilder
{
public:
ProjectPartBuilder(ProjectInfo &m_pInfo);
void setQtVersion(ProjectPart::QtVersion qtVersion);
void setCFlags(const QStringList &flags);
void setCxxFlags(const QStringList &flags);
void setDefines(const QByteArray &defines);
void setHeaderPaths(const ProjectPart::HeaderPaths &headerPaths);
void setIncludePaths(const QStringList &includePaths);
void setPreCompiledHeaders(const QStringList &pchs);
void setProjectFile(const QString &projectFile);
void setDisplayName(const QString &displayName);
void setConfigFileName(const QString &configFileName);
QList<Core::Id> createProjectPartsForFiles(const QStringList &files);
private:
void createProjectPart(const QStringList &theSources, const QString &partName,
ProjectPart::CVersion cVersion, ProjectPart::CXXVersion cxxVersion);
private:
ProjectPart::Ptr m_templatePart;
ProjectInfo &m_pInfo;
QStringList m_cFlags, m_cxxFlags;
};
} // namespace CppTools
#endif // CPPPROJECTPART_H