From 850319e56c06af175d3c3179d6cda287cc82cacf Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@nokia.com>
Date: Mon, 7 Nov 2011 13:02:13 +0100
Subject: [PATCH] Apply changes of global tab settings to editors
Return global tab settings in case there are no
code style settings for passed languageId
Task-number: QTCREATORBUG-6429
Change-Id: Ieccd265fa03bfba0832d285a6443633dd27ba03a
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
---
src/plugins/texteditor/texteditorsettings.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index 85901e0f5a2..9c7188d4135 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -368,7 +368,7 @@ ICodeStylePreferences *TextEditorSettings::codeStyle() const
ICodeStylePreferences *TextEditorSettings::codeStyle(const QString &languageId) const
{
- return m_d->m_languageToCodeStyle.value(languageId);
+ return m_d->m_languageToCodeStyle.value(languageId, codeStyle());
}
QMap<QString, ICodeStylePreferences *> TextEditorSettings::codeStyles() const
--
GitLab