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

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp
	src/plugins/genericprojectmanager/genericproject.h
	src/plugins/projectexplorer/projectmodels.cpp

Change-Id: I290cba328212cadd3c12909d1f2f3642d326a1ca
This commit is contained in:
Eike Ziller
2017-03-28 09:56:16 +02:00
parent 39e8b3e355 2ee7967750
commit 016767b2a6
139 changed files with 1057 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,8 +44,6 @@ public:
QString displayName() const override;
QStringList files(FilesMode fileMode) const override;
QStringList buildTargets() const;
bool addFiles(const QStringList &filePaths);
@@ -61,8 +59,6 @@ public:
void refresh(RefreshOptions options);
QStringList files() const;
protected:
RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override;