1 files changed, 14 insertions, 13 deletions
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 5f7edb0f79..3eeaf50cbc 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -66,6 +66,7 @@
 #include <extensionsystem/pluginmanager.h>
 #include <find/findplugin.h>
 #include <texteditor/texteditorconstants.h>
+#include <utils/hostosinfo.h>
 #include <utils/styledbar.h>
 
 #include <QDir>
@@ -252,12 +253,12 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
     cmd->setDefaultKeySequence(QKeySequence(Qt::Key_F1));
     connect(action, SIGNAL(triggered()), this, SLOT(activateContext()));
 
-#ifndef Q_OS_MAC
-    action = new QAction(this);
-    action->setSeparator(true);
-    cmd = Core::ActionManager::registerAction(action, Core::Id("Help.Separator"), globalcontext);
-    Core::ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
-#endif
+    if (!Utils::HostOsInfo::isMacHost()) {
+        action = new QAction(this);
+        action->setSeparator(true);
+        cmd = Core::ActionManager::registerAction(action, Core::Id("Help.Separator"), globalcontext);
+        Core::ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
+    }
 
     action = new QAction(tr("Technical Support"), this);
     cmd = Core::ActionManager::registerAction(action, Core::Id("Help.TechSupport"), globalcontext);
@@ -269,12 +270,12 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
     Core::ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
     connect(action, SIGNAL(triggered()), this, SLOT(slotReportBug()));
 
-#ifndef Q_OS_MAC
-    action = new QAction(this);
-    action->setSeparator(true);
-    cmd = Core::ActionManager::registerAction(action, Core::Id("Help.Separator2"), globalcontext);
-    Core::ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
-#endif
+    if (!Utils::HostOsInfo::isMacHost()) {
+        action = new QAction(this);
+        action->setSeparator(true);
+        cmd = Core::ActionManager::registerAction(action, Core::Id("Help.Separator2"), globalcontext);
+        Core::ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
+    }
 
     action = new QAction(this);
     Core::ActionManager::registerAction(action, Core::Constants::PRINT, modecontext);
@@ -772,7 +773,7 @@ void HelpPlugin::fontChanged()
         createRightPaneContextViewer();
 
     const QHelpEngine &engine = LocalHelpManager::helpEngine();
-    QFont font = qVariantValue<QFont>(engine.customValue(QLatin1String("font"),
+    QFont font = qvariant_cast<QFont>(engine.customValue(QLatin1String("font"),
         m_helpViewerForSideBar->viewerFont()));
 
     m_helpViewerForSideBar->setFont(font);