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

9
src/plugins/cppeditor/cppquickfixes.cpp
View File

@@ -4117,8 +4117,8 @@ void GetterSetterRefactoringHelper::performGeneration(ExistingGetterSetterData d
// signal declaration
if (generateFlags & Flag::GenerateSignal) {
const auto &paramType = overview.prettyType(returnTypeHeader);
const QString newValue = m_settings->signalWithNewValue ? paramType : QString();
const auto &parameter = overview.prettyType(returnTypeHeader, data.qPropertyName);
const QString newValue = m_settings->signalWithNewValue ? parameter : QString();
const QString declaration = QString("void %1(%2);\n").arg(data.signalName, newValue);
addHeaderCode(InsertionPointLocator::Signals, declaration);
}
@@ -4140,8 +4140,9 @@ void GetterSetterRefactoringHelper::performGeneration(ExistingGetterSetterData d
type = ref->elementType();
type.setConst(false);
QString propertyDeclaration = QLatin1String("Q_PROPERTY(") + overview.prettyType(type)
+ QLatin1Char(' ') + memberBaseName(data.memberVariableName);
QString propertyDeclaration = QLatin1String("Q_PROPERTY(")
+ overview.prettyType(type,
memberBaseName(data.memberVariableName));
bool needMember = false;
if (data.getterName.isEmpty())
needMember = true;