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/cmakeprojectmanager/servermodereader.cpp

Change-Id: I58e7b33d32c41cb48a24a5638ddb256212dd6107
This commit is contained in:
Eike Ziller
2017-03-30 13:59:12 +02:00
parent 61b6aa5c84 5afc149b69
commit bac2e6c17a
71 changed files with 798 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,9 @@
using namespace CppTools::Internal;
using namespace CppTools::Tests;
TestProject::TestProject(const QString &name, QObject *parent) : m_name (name)
TestProject::TestProject(const QString &name, QObject *parent) :
ProjectExplorer::Project("x-binary/foo", Utils::FileName()),
m_name(name)
{
setParent(parent);
setId(Core::Id::fromString(name));

2
src/plugins/cpptools/semantichighlighter.cpp
View File

@@ -138,7 +138,7 @@ static TextStyles mixinStyle(TextStyle main, TextStyle mixin)
{
TextStyles res;
res.mainStyle = main;
res.mixinStyles.fillWithZero();
res.mixinStyles.initializeElements();
res.mixinStyles.push_back(mixin);
return res;
}