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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Conflicts:
	src/libs/utils/processreaper.cpp
	src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
	src/plugins/cmakeprojectmanager/cmakeprocess.cpp

Change-Id: Ie248bcb02a80f3e02ab19d73033ce2ba31e7fd83
This commit is contained in:
Eike Ziller
2021-09-07 08:56:42 +02:00
parent d739ba8a7d 93857c279c
commit 8e51295959
101 changed files with 1050 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/cppeditor/cppquickfix_test.cpp
View File

@@ -2813,12 +2813,12 @@ class Foo
{
public:
custom<N2::test> bar@;
N2::test*getBar() const;
N2::test *getBar() const;
void setBar(const custom<N2::test> &newBar);
signals:
void barChanged(N2::test*);
void barChanged(N2::test *bar);
private:
Q_PROPERTY(N2::test* bar READ getBar NOTIFY barChanged)
Q_PROPERTY(N2::test *bar READ getBar NOTIFY barChanged)
};
})--";
testDocuments << QuickFixTestDocument::create("file.h", original, expected);
@@ -2827,7 +2827,7 @@ private:
original = "";
expected = R"-(
using namespace N1;
N2::test*Foo::getBar() const
N2::test *Foo::getBar() const
{
return bar.get();
}
@@ -2852,7 +2852,7 @@ void Foo::setBar(const custom<N2::test> &newBar)
t.types.append("custom");
t.equalComparison = "<cur>.equals(<new>)";
t.returnExpression = "<cur>.get()";
t.returnType = "<T>*";
t.returnType = "<T> *";
t.assignment = "<cur>.assign(<new>)";
s->customTemplates.push_back(t);
@@ -3613,7 +3613,7 @@ void QuickfixTest::testInsertQtPropertyMembers_data()
" }\n"
"\n"
"signals:\n"
" void itChanged(int);\n"
" void itChanged(int it);\n"
"\n"
"private:\n"
" int m_it;\n"
@@ -3646,7 +3646,7 @@ void QuickfixTest::testInsertQtPropertyMembers_data()
" }\n"
"\n"
"signals:\n"
" void itChanged(int);\n"
" void itChanged(int it);\n"
"\n"
"private:\n"
" int m_it;\n"
@@ -3708,7 +3708,7 @@ void QuickfixTest::testInsertQtPropertyMembers_data()
" emit itChanged(m_it);\n"
" }\n"
"signals:\n"
" void itChanged(int);\n"
" void itChanged(int it);\n"
"};\n"
"\n"
"int XmarksTheSpot::getIt() const\n"