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

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Conflicts:
	src/plugins/clangformat/clangformatconfigwidget.cpp
	src/plugins/clangformat/clangformatplugin.cpp
	src/plugins/cppeditor/cppcodestylepreferencesfactory.cpp
	src/plugins/cppeditor/cppcodestylepreferencesfactory.h
	src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
	src/plugins/nim/settings/nimcodestylepreferencesfactory.h
	src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
	src/plugins/qmljstools/qmljscodestylepreferencesfactory.h
	src/plugins/texteditor/codestyleselectorwidget.cpp
	src/plugins/texteditor/icodestylepreferencesfactory.h

Change-Id: I20ee430a7f0085774c9df1aa5487046ba4f404c1
This commit is contained in:
Eike Ziller
2022-05-10 12:13:36 +02:00
parent 9bf0efcbb9 bbc44cfb90
commit 502223337d
14 changed files with 61 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/clangformat/clangformatplugin.cpp
View File

@@ -85,12 +85,11 @@ public:
}
std::pair<CppEditor::CppCodeStyleWidget *, QString> additionalTab(
TextEditor::ICodeStylePreferences *codeStyle, QWidget *parent) const override
TextEditor::ICodeStylePreferences *codeStyle,
ProjectExplorer::Project *project,
QWidget *parent) const override
{
if (!parent)
return {new ClangFormatConfigWidget(codeStyle), tr("ClangFormat")};
return {new ClangFormatConfigWidget(codeStyle, SessionManager::startupProject()),
tr("ClangFormat")};
return {new ClangFormatConfigWidget(codeStyle, project, parent), tr("ClangFormat")};
}
};