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

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	qtcreator.pri
	src/plugins/qnx/qnxutils.cpp

Change-Id: I019ad21fb4c128eb736c8ab2d09310757e3be037
This commit is contained in:
Eike Ziller
2013-10-24 08:56:29 +02:00
parent 328daa9c5a b889bb1608
commit c3119d1aa7
192 changed files with 2423 additions and 1016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/genericprojectmanager/genericproject.h
View File

@@ -85,7 +85,6 @@ public:
void setIncludePaths(const QStringList &includePaths);
QByteArray defines() const;
QStringList allIncludePaths() const;
QStringList projectIncludePaths() const;
QStringList files() const;
@@ -111,7 +110,6 @@ private:
QStringList m_rawFileList;
QStringList m_files;
QHash<QString, QString> m_rawListEntries;
QStringList m_includePaths;
QStringList m_projectIncludePaths;
QByteArray m_defines;