diff options
| author | Jarek Kobus <jaroslaw.kobus@nokia.com> | 2011-11-07 13:02:13 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@nokia.com> | 2011-11-07 13:24:33 +0100 |
| commit | 850319e56c06af175d3c3179d6cda287cc82cacf (patch) | |
| tree | dc5a275ab95024efc16332752e9491af5c3878bc | |
| parent | 5e0b7441d2e2f5ad3fd1f512bdac52d187893a3f (diff) | |
| download | qt-creator-850319e56c06af175d3c3179d6cda287cc82cacf.tar.gz | |
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>
| -rw-r--r-- | src/plugins/texteditor/texteditorsettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index 85901e0f5a..9c7188d413 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 |