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

C++: ProjectParts now contain everything that gets linked together.

Browse Source 
Change-Id: Ib862e51897156a03a4a45e2a1690b00caeb03518
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Erik Verbruggen
2012-11-23 16:29:00 +01:00
parent ace205fe91
commit 964c01a460
7 changed files with 57 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/cpptools/ModelManagerInterface.h
View File

@@ -68,37 +68,36 @@ class CPPTOOLS_EXPORT CppModelManagerInterface : public QObject
Q_OBJECT
public:
enum Language { CXX, OBJC };
class CPPTOOLS_EXPORT ProjectPart
{
public:
ProjectPart()
: language(CXX)
, cxx11Enabled(false)
, qtVersion(UnknownQt)
{}
public: //attributes
QStringList sourceFiles;
QByteArray defines;
QStringList includePaths;
QStringList frameworkPaths;
QStringList precompiledHeaders;
Language language;
bool cxx11Enabled;
public: // enums and types
enum Language { CXX, CXX11, C99, C89 };
enum QtVersion {
UnknownQt = -1,
NoQt = 0,
Qt4 = 1,
Qt5 = 2
};
QtVersion qtVersion;
bool objcEnabled() const
{ return language == CppModelManagerInterface::OBJC; }
typedef QSharedPointer<ProjectPart> Ptr;
public: //attributes
QStringList headerFiles;
QStringList sourceFiles;
QStringList objcSourceFiles;
QByteArray defines;
QStringList includePaths;
QStringList frameworkPaths;
QStringList precompiledHeaders;
Language language;
QtVersion qtVersion;
};
class CPPTOOLS_EXPORT ProjectInfo