Help: Fix compile for Qt5.5

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

View File

@@ -109,7 +109,7 @@ QString HelpViewer::mimeFromUrl(const QUrl &url)
return QLatin1String(e->mimeType); return QLatin1String(e->mimeType);
++e; ++e;
} }
return ""; return QString();
} }
bool HelpViewer::launchWithExternalApp(const QUrl &url) bool HelpViewer::launchWithExternalApp(const QUrl &url)

View File

@@ -396,9 +396,9 @@ QString HelpWidget::sideBarSettingsKey() const
{ {
switch (m_style) { switch (m_style) {
case ModeWidget: case ModeWidget:
return kModeSideBarSettingsKey; return QString(kModeSideBarSettingsKey);
case ExternalWindow: case ExternalWindow:
return kWindowSideBarSettingsKey; return QString(kWindowSideBarSettingsKey);
case SideBarWidget: case SideBarWidget:
QTC_CHECK(false); QTC_CHECK(false);
break; break;

View File

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