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

TextEditor: Fix compile for Qt < 5.5

Browse Source 
Change-Id: I653d76452289a91fdb069be14dd2c8816f856306
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Christian Stenger
2016-02-23 11:03:01 +01:00
parent b21b5bb2ae
commit a73c824083
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/texteditor/fontsettings.cpp
View File

@@ -178,9 +178,8 @@ QTextCharFormat FontSettings::toTextCharFormat(TextStyle category) const
uint qHash(const TextStyles &textStyles) uint qHash(const TextStyles &textStyles)
{ {
uint hash = ::qHash(quint8(textStyles.mainStyle)); uint hash = ::qHash(quint8(textStyles.mainStyle));
for (TextStyle mixinStyle : textStyles.mixinStyles)
hash ^= ::qHashRange(textStyles.mixinStyles.cbegin(), textStyles.mixinStyles.cend()); hash ^= ::qHash(mixinStyle);
return hash; return hash;
} }