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/cpptoolssettings.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/cpptoolssettings.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolssettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cpptoolssettings.cpp b/src/plugins/cpptools/cpptoolssettings.cpp index 605487ffcb..2f034bac91 100644 --- a/src/plugins/cpptools/cpptoolssettings.cpp +++ b/src/plugins/cpptools/cpptoolssettings.cpp @@ -172,7 +172,7 @@ CppToolsSettings::CppToolsSettings(QObject *parent) // load global settings (after built-in settings are added to the pool) QSettings *s = Core::ICore::settings(); - d->m_globalCodeStyle->fromSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), Core::ICore::settings()); + d->m_globalCodeStyle->fromSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); // legacy handling start (Qt Creator Version < 2.4) const bool legacyTransformed = |