diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-11-28 11:08:15 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-11-28 11:12:23 +0100 |
| commit | 1fbf4d9a554433a28181a69105819f64c36c2db6 (patch) | |
| tree | 2ccb57e4065762520b87018f9649cf54e1f664e3 /src/plugins | |
| parent | fa0e63ca7ab9fee37a513a1f45c2106e08ff0558 (diff) | |
| download | qt-creator-1fbf4d9a554433a28181a69105819f64c36c2db6.tar.gz | |
Fix tab settings for non-code files.
In the case when they are part of the project. The project's
EditorConfiguration had an wrongly initialized default editor setting.
Change-Id: If6e39ed3efca39d726c28b8278a059c8bbe7c3fc
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/projectexplorer/editorconfiguration.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp index a44cf0f9b1..f42c8a11e9 100644 --- a/src/plugins/projectexplorer/editorconfiguration.cpp +++ b/src/plugins/projectexplorer/editorconfiguration.cpp @@ -111,6 +111,8 @@ EditorConfiguration::EditorConfiguration() : d(new EditorConfigurationPrivate) d->m_defaultCodeStyle->setDelegatingPool(textEditorSettings->codeStylePool()); d->m_defaultCodeStyle->setDisplayName(tr("Project", "Settings")); d->m_defaultCodeStyle->setId(kId); + d->m_defaultCodeStyle->setCurrentDelegate(d->m_useGlobal + ? TextEditorSettings::instance()->codeStyle() : 0); } EditorConfiguration::~EditorConfiguration() |