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

Help: Fix compile for Qt5.5

Browse Source 
Change-Id: I8b8063043d5a6be2dc8f9ce1e2e9e36646959050
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
This commit is contained in:
Christian Stenger
2016-07-21 08:35:30 +02:00
parent c25ac73f65
commit a769d2f810
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/help/localhelpmanager.cpp
View File

@@ -79,16 +79,16 @@ static const int kDefaultFallbackFontSize = 14;
static QString defaultFallbackFontFamily()
{
if (Utils::HostOsInfo::isMacHost())
return "Helvetica";
return QString("Helvetica");
if (Utils::HostOsInfo::isAnyUnixHost())
return "sans-serif";
return "Arial";
return QString("sans-serif");
return QString("Arial");
}
static QString defaultFallbackFontStyleName(const QString &fontFamily)
{
const QStringList styles = QFontDatabase().styles(fontFamily);
QTC_ASSERT(!styles.isEmpty(), return "Regular");
QTC_ASSERT(!styles.isEmpty(), return QString("Regular"));
return styles.first();
}