feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppEditor: Fix compile with Qt5.14

Browse Source 
Amends ef30831213.

Change-Id: I3c8a962c558114bd64e8e07d7212e4f14ecffa90
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Stenger
2021-12-06 12:40:16 +01:00
parent 6cf6f1c230
commit 41b8e302ef
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cppeditor/cppcodestylepreferences.cpp
View File

@@ -92,8 +92,11 @@ void CppCodeStylePreferences::slotCurrentValueChanged(const QVariant &value)
QVariantMap CppCodeStylePreferences::toMap() const
{
QVariantMap map = ICodeStylePreferences::toMap();
if (!currentDelegate())
map.insert(m_data.toMap());
if (!currentDelegate()) {
const QVariantMap dataMap = m_data.toMap();
for (auto it = dataMap.begin(), end = dataMap.end(); it != end; ++it)
map.insert(it.key(), it.value());
}
return map;
}