Merge remote-tracking branch 'origin/7.0'

 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

1 files changed, 4 insertions, 5 deletions

diff --git a/src/plugins/clangformat/clangformatplugin.cpp b/src/plugins/clangformat/clangformatplugin.cpp
index 78204ae369..69ef7235fe 100644
--- a/src/plugins/clangformat/clangformatplugin.cpp
+++ b/src/plugins/clangformat/clangformatplugin.cpp
@@ -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")};
     }
 };