Merge remote-tracking branch 'origin/4.9'

 Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/pythoneditor/pythoneditorplugin.cpp

Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6

2 files changed, 3 insertions, 23 deletions

diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp
index dcb5edaeb13..2e039c5ec1a 100644
--- a/src/plugins/clangformat/clangformatbaseindenter.cpp
+++ b/src/plugins/clangformat/clangformatbaseindenter.cpp
@@ -188,8 +188,6 @@ QByteArray dummyTextForContext(CharacterContext context, bool closingBraceBlock)
     }
 
     switch (context) {
-    case CharacterContext::Unknown:
-        QTC_ASSERT(false, return "";);
     case CharacterContext::AfterComma:
         return "a,";
     case CharacterContext::NewStatement:
@@ -197,6 +195,9 @@ QByteArray dummyTextForContext(CharacterContext context, bool closingBraceBlock)
     case CharacterContext::Continuation:
     case CharacterContext::LastAfterComma:
         return "& a &";
+    case CharacterContext::Unknown:
+    default:
+        QTC_ASSERT(false, return "";);
     }
 }
 
diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp
index 74c4165a34b..61e93862825 100644
--- a/src/plugins/clangformat/clangformatutils.cpp
+++ b/src/plugins/clangformat/clangformatutils.cpp
@@ -143,27 +143,6 @@ static clang::format::FormatStyle qtcStyle()
     return style;
 }
 
-static void applyTabSettings(clang::format::FormatStyle &style, const TabSettings &settings)
-{
-    style.IndentWidth = static_cast<unsigned>(settings.m_indentSize);
-    style.TabWidth = static_cast<unsigned>(settings.m_tabSize);
-
-    if (settings.m_tabPolicy == TabSettings::TabsOnlyTabPolicy)
-        style.UseTab = FormatStyle::UT_Always;
-    else if (settings.m_tabPolicy == TabSettings::SpacesOnlyTabPolicy)
-        style.UseTab = FormatStyle::UT_Never;
-    else
-        style.UseTab = FormatStyle::UT_ForContinuationAndIndentation;
-
-    if (settings.m_continuationAlignBehavior == TabSettings::NoContinuationAlign) {
-        style.ContinuationIndentWidth = 0;
-        style.AlignAfterOpenBracket = FormatStyle::BAS_DontAlign;
-    } else {
-        style.ContinuationIndentWidth = style.IndentWidth;
-        style.AlignAfterOpenBracket = FormatStyle::BAS_Align;
-    }
-}
-
 static bool useGlobalOverriddenSettings()
 {
     return ClangFormatSettings::instance().overrideDefaultFile();