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/genericprojectmanager/genericprojectnodes.cpp
	src/plugins/genericprojectmanager/genericprojectnodes.h

Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175
This commit is contained in:
Eike Ziller
2017-04-19 09:56:14 +02:00
parent 8b6eb5aabb 01b2ed7904
commit 88897f3a87
232 changed files with 3919 additions and 1830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cpptools/modelmanagertesthelper.cpp
View File

@@ -42,13 +42,10 @@ TestProject::TestProject(const QString &name, QObject *parent) :
{
setParent(parent);
setId(Core::Id::fromString(name));
setDisplayName(name);
qRegisterMetaType<QSet<QString> >();
}
TestProject::~TestProject()
{
}
ModelManagerTestHelper::ModelManagerTestHelper(QObject *parent,
bool testOnlyForCleanedProjects)
: QObject(parent)

3
src/plugins/cpptools/modelmanagertesthelper.h
View File

@@ -41,9 +41,6 @@ class CPPTOOLS_EXPORT TestProject: public ProjectExplorer::Project
public:
TestProject(const QString &name, QObject *parent);
~TestProject() override;
QString displayName() const override { return m_name; }
private:
QString m_name;