diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-05-30 13:48:27 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-05-30 13:48:27 +0200 |
| commit | 0a95b28147d9c4ea57ba9b025beec2d503399acf (patch) | |
| tree | 9032878c4c1b3877167990376d3871db70eb304c /src/plugins/cpptools/cppcodestylesettingspage.cpp | |
| parent | cca4cbfb02da327c844c1291d43a8f7f6420e334 (diff) | |
| parent | 10d7d61e263573116965b1af53cdbda0f668211d (diff) | |
| download | qt-creator-0a95b28147d9c4ea57ba9b025beec2d503399acf.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
Diffstat (limited to 'src/plugins/cpptools/cppcodestylesettingspage.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcodestylesettingspage.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp index 8203321355..01a0589eb5 100644 --- a/src/plugins/cpptools/cppcodestylesettingspage.cpp +++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp @@ -590,18 +590,15 @@ void CppCodeStyleSettingsPage::apply() CppCodeStylePreferences *originalCppCodeStylePreferences = CppToolsSettings::instance()->cppCodeStyle(); if (originalCppCodeStylePreferences->codeStyleSettings() != m_pageCppCodeStylePreferences->codeStyleSettings()) { originalCppCodeStylePreferences->setCodeStyleSettings(m_pageCppCodeStylePreferences->codeStyleSettings()); - if (s) - originalCppCodeStylePreferences->toSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); + originalCppCodeStylePreferences->toSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); } if (originalCppCodeStylePreferences->tabSettings() != m_pageCppCodeStylePreferences->tabSettings()) { originalCppCodeStylePreferences->setTabSettings(m_pageCppCodeStylePreferences->tabSettings()); - if (s) - originalCppCodeStylePreferences->toSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); + originalCppCodeStylePreferences->toSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); } if (originalCppCodeStylePreferences->currentDelegate() != m_pageCppCodeStylePreferences->currentDelegate()) { originalCppCodeStylePreferences->setCurrentDelegate(m_pageCppCodeStylePreferences->currentDelegate()); - if (s) - originalCppCodeStylePreferences->toSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); + originalCppCodeStylePreferences->toSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); } } } |