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

TextEditor: Fix compile on OSX

Browse Source 
Change-Id: I0ed48bc18489a59b0205f56a89b84e9e21fe29ca
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Christian Stenger
2016-02-23 14:28:40 +01:00
parent a73c824083
commit 466bf485b0
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,6 +134,11 @@ bool FontSettings::equals(const FontSettings &f) const
&& m_scheme == f.m_scheme; && m_scheme == f.m_scheme;
} }
uint qHash(const TextStyle &textStyle)
{
return ::qHash(quint8(textStyle));
}
/** /**
* Returns the QTextCharFormat of the given format category. * Returns the QTextCharFormat of the given format category.
*/ */
@@ -177,9 +182,9 @@ 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(textStyles.mainStyle);
for (TextStyle mixinStyle : textStyles.mixinStyles) for (TextStyle mixinStyle : textStyles.mixinStyles)
hash ^= ::qHash(mixinStyle); hash ^= qHash(mixinStyle);
return hash; return hash;
} }