Merge remote-tracking branch 'origin/10.0'

Conflicts:
	coin/instructions/build.yaml

Change-Id: I697b0107e75c6259989247de2180437d7987ff37

src/plugins/clangformat/clangformatglobalconfigwidget.cpp

@@ -39,6 +39,7 @@ ClangFormatGlobalConfigWidget::ClangFormatGlobalConfigWidget(
     m_overrideDefault = new QCheckBox(Tr::tr("Override .clang-format file"));
     m_useGlobalSettings = new QCheckBox(Tr::tr("Use global settings"));
     m_useGlobalSettings->hide();
+    m_overrideDefaultFile = ClangFormatSettings::instance().overrideDefaultFile();
 
     using namespace Layouting;
 
@@ -190,10 +191,12 @@ void ClangFormatGlobalConfigWidget::initOverrideCheckBox()
     setTemporarilyReadOnly();
 
     connect(m_overrideDefault, &QCheckBox::toggled, this, [this, setTemporarilyReadOnly](bool checked) {
-        if (m_project)
+        if (m_project) {
             m_project->setNamedSettings(Constants::OVERRIDE_FILE_ID, checked);
-        else
+        } else {
+            ClangFormatSettings::instance().setOverrideDefaultFile(checked);
             setTemporarilyReadOnly();
+        }
     });
 
     connect(m_codeStyle,
@@ -212,12 +215,14 @@ void ClangFormatGlobalConfigWidget::apply()
         settings.setMode(
             static_cast<ClangFormatSettings::Mode>(m_indentingOrFormatting->currentIndex()));
         settings.setOverrideDefaultFile(m_overrideDefault->isChecked());
+        m_overrideDefaultFile = m_overrideDefault->isChecked();
     }
     settings.write();
 }
 
 void ClangFormatGlobalConfigWidget::finish()
 {
+    ClangFormatSettings::instance().setOverrideDefaultFile(m_overrideDefaultFile);
     m_codeStyle->currentPreferences()->setTemporarilyReadOnly(
         !ClangFormatSettings::instance().overrideDefaultFile());
 }

src/plugins/clangformat/clangformatglobalconfigwidget.h

@@ -43,6 +43,7 @@ private:
     ProjectExplorer::Project *m_project;
     TextEditor::ICodeStylePreferences *m_codeStyle;
     Utils::Guard m_ignoreChanges;
+    bool m_overrideDefaultFile;
 
     QLabel *m_projectHasClangFormat;
     QLabel *m_formattingModeLabel;

src/plugins/clangformat/clangformatutils.cpp

@@ -214,12 +214,7 @@ bool getCurrentOverriddenSettings(const Utils::FilePath &filePath)
         filePath);
 
     return getProjectUseGlobalSettings(project)
-               ? !TextEditor::TextEditorSettings::codeStyle("Cpp")
-                         ->currentPreferences()
-                         ->isTemporarilyReadOnly()
-                     && !TextEditor::TextEditorSettings::codeStyle("Cpp")
-                             ->currentPreferences()
-                             ->isAdditionalTabDisabled()
+               ? ClangFormatSettings::instance().overrideDefaultFile()
                : getProjectOverriddenSettings(project);
 }