21 files changed, 152 insertions, 199 deletions
diff --git a/src/plugins/help/centralwidget.cpp b/src/plugins/help/centralwidget.cpp
index 6177650a30..43dea44778 100644
--- a/src/plugins/help/centralwidget.cpp
+++ b/src/plugins/help/centralwidget.cpp
@@ -288,7 +288,7 @@ void CentralWidget::focusInEvent(QFocusEvent * /* event */)
 void CentralWidget::highlightSearchTerms()
 {
     if (HelpViewer *viewer = currentHelpViewer()) {
-        QHelpSearchEngine *searchEngine = 
+        QHelpSearchEngine *searchEngine =
             LocalHelpManager::helpEngine().searchEngine();
         QList<QHelpSearchQuery> queryList = searchEngine->query();
 
diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp
index f1fe9fab79..061c54d91e 100644
--- a/src/plugins/help/docsettingspage.cpp
+++ b/src/plugins/help/docsettingspage.cpp
@@ -42,9 +42,9 @@ using namespace Help::Internal;
 
 DocSettingsPage::DocSettingsPage()
 {
-    setId(QLatin1String("B.Documentation"));
+    setId("B.Documentation");
     setDisplayName(tr("Documentation"));
-    setCategory(QLatin1String(Help::Constants::HELP_CATEGORY));
+    setCategory(Help::Constants::HELP_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY));
     setCategoryIcon(QLatin1String(Help::Constants::HELP_CATEGORY_ICON));
 }
diff --git a/src/plugins/help/externalhelpwindow.cpp b/src/plugins/help/externalhelpwindow.cpp
index 2c8fc6eae0..d4fad1c23e 100644
--- a/src/plugins/help/externalhelpwindow.cpp
+++ b/src/plugins/help/externalhelpwindow.cpp
@@ -35,6 +35,7 @@
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
+#include <utils/hostosinfo.h>
 
 #include <QAction>
 #include <QHBoxLayout>
@@ -48,7 +49,7 @@ ExternalHelpWindow::ExternalHelpWindow(QWidget *parent)
     : QMainWindow(parent)
 {
     QSettings *settings = Core::ICore::settings();
-    settings->beginGroup(Help::Constants::ID_MODE_HELP);
+    settings->beginGroup(QLatin1String(Help::Constants::ID_MODE_HELP));
 
     const QVariant geometry = settings->value(QLatin1String("geometry"));
     if (geometry.isValid())
@@ -138,21 +139,21 @@ ExternalHelpWindow::ExternalHelpWindow(QWidget *parent)
         SLOT(gotoNextPage()));
     addAction(ctrlShiftTab);
 
-    action = new QAction(QIcon(Core::Constants::ICON_TOGGLE_SIDEBAR),
+    action = new QAction(QIcon(QLatin1String(Core::Constants::ICON_TOGGLE_SIDEBAR)),
         tr("Show Sidebar"), this);
     connect(action, SIGNAL(triggered()), this, SIGNAL(showHideSidebar()));
 
-#ifdef Q_OS_MAC
-    reset->setShortcut(QKeySequence(Qt::ALT + Qt::Key_0));
-    action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0));
-    ctrlTab->setShortcut(QKeySequence(Qt::ALT + Qt::Key_Tab));
-    ctrlShiftTab->setShortcut(QKeySequence(Qt::ALT + Qt::SHIFT + Qt::Key_Tab));
-#else
-    reset->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0));
-    action->setShortcut(QKeySequence(Qt::ALT + Qt::Key_0));
-    ctrlTab->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Tab));
-    ctrlShiftTab->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Tab));
-#endif
+    if (Utils::HostOsInfo::isMacHost()) {
+        reset->setShortcut(QKeySequence(Qt::ALT + Qt::Key_0));
+        action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0));
+        ctrlTab->setShortcut(QKeySequence(Qt::ALT + Qt::Key_Tab));
+        ctrlShiftTab->setShortcut(QKeySequence(Qt::ALT + Qt::SHIFT + Qt::Key_Tab));
+    } else {
+        reset->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0));
+        action->setShortcut(QKeySequence(Qt::ALT + Qt::Key_0));
+        ctrlTab->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Tab));
+        ctrlShiftTab->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Tab));
+    }
 
     QToolButton *button = new QToolButton;
     button->setDefaultAction(action);
@@ -178,7 +179,7 @@ ExternalHelpWindow::~ExternalHelpWindow()
 void ExternalHelpWindow::closeEvent(QCloseEvent *event)
 {
     QSettings *settings = Core::ICore::settings();
-    settings->beginGroup(Help::Constants::ID_MODE_HELP);
+    settings->beginGroup(QLatin1String(Help::Constants::ID_MODE_HELP));
     settings->setValue(QLatin1String("geometry"), saveGeometry());
     settings->endGroup();
 
diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp
index 216e97f865..023d7a99cd 100644
--- a/src/plugins/help/filtersettingspage.cpp
+++ b/src/plugins/help/filtersettingspage.cpp
@@ -43,9 +43,9 @@ using namespace Help::Internal;
 
 FilterSettingsPage::FilterSettingsPage()
 {
-    setId(QLatin1String("D.Filters"));
+    setId("D.Filters");
     setDisplayName(tr("Filters"));
-    setCategory(QLatin1String(Help::Constants::HELP_CATEGORY));
+    setCategory(Help::Constants::HELP_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY));
     setCategoryIcon(QLatin1String(Help::Constants::HELP_CATEGORY_ICON));
 }
diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp
index 42d0f93bbe..7d951747b0 100644
--- a/src/plugins/help/generalsettingspage.cpp
+++ b/src/plugins/help/generalsettingspage.cpp
@@ -63,9 +63,9 @@ GeneralSettingsPage::GeneralSettingsPage()
     QWebSettings* webSettings = QWebSettings::globalSettings();
     m_font.setPointSize(webSettings->fontSize(QWebSettings::DefaultFontSize));
 #endif
-    setId(QLatin1String("A.General settings"));
+    setId("A.General settings");
     setDisplayName(tr("General"));
-    setCategory(QLatin1String(Help::Constants::HELP_CATEGORY));
+    setCategory(Help::Constants::HELP_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY));
     setCategoryIcon(QLatin1String(Help::Constants::HELP_CATEGORY_ICON));
 }
@@ -79,7 +79,7 @@ QWidget *GeneralSettingsPage::createPage(QWidget *parent)
     m_ui->styleComboBox->setEditable(false);
 
     Core::HelpManager *manager = Core::HelpManager::instance();
-    m_font = qVariantValue<QFont>(manager->customValue(QLatin1String("font"),
+    m_font = qvariant_cast<QFont>(manager->customValue(QLatin1String("font"),
         m_font));
 
     updateFontSize();
@@ -185,7 +185,7 @@ void GeneralSettingsPage::apply()
         manager->setCustomValue(QLatin1String("ContextHelpOption"), helpOption);
 
         QSettings *settings = Core::ICore::settings();
-        settings->beginGroup(Help::Constants::ID_MODE_HELP);
+        settings->beginGroup(QLatin1String(Help::Constants::ID_MODE_HELP));
         settings->setValue(QLatin1String("ContextHelpOption"), helpOption);
         settings->endGroup();
 
@@ -246,7 +246,7 @@ void GeneralSettingsPage::exportBookmarks()
     m_ui->errorLabel->setVisible(false);
 
     QString fileName = QFileDialog::getSaveFileName(0, tr("Save File"),
-        "untitled.xbel", tr("Files (*.xbel)"));
+        QLatin1String("untitled.xbel"), tr("Files (*.xbel)"));
 
     QLatin1String suffix(".xbel");
     if (!fileName.endsWith(suffix))
@@ -337,9 +337,8 @@ int GeneralSettingsPage::closestPointSizeIndex(int desiredPointSize) const
             if (closestAbsError == 0)
                 break;
         } else {    // past optimum
-            if (absError > closestAbsError) {
+            if (absError > closestAbsError)
                 break;
-            }
         }
     }
     return closestIndex;
diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro
index 26aa05b25b..7e2dd639dc 100644
--- a/src/plugins/help/help.pro
+++ b/src/plugins/help/help.pro
@@ -16,7 +16,9 @@ INCLUDEPATH += $$PWD
 include(../../qtcreatorplugin.pri)
 include(help_dependencies.pri)
 
-DEFINES += QT_CLUCENE_SUPPORT HELP_LIBRARY
+DEFINES += \
+    QT_CLUCENE_SUPPORT \
+    HELP_LIBRARY
 
 HEADERS += \
     centralwidget.h \
@@ -62,7 +64,7 @@ SOURCES += \
     searchwidget.cpp \
     xbelsupport.cpp \
     externalhelpwindow.cpp
-    
+
 FORMS += docsettingspage.ui \
     filtersettingspage.ui \
     generalsettingspage.ui \
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index 97eaefe9ec..75152239c4 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -18,85 +18,75 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "Find" }
     Depends { name: "Locator" }
+    Depends { name: "app_version_header" }
 
     Depends { name: "cpp" }
     Properties {
         condition: qtcore.versionMajor >= 5
         cpp.defines: base.concat(["QT_NO_WEBKIT"])
     }
-    cpp.defines: base.concat([
-        "QT_CLUCENE_SUPPORT",
-        "HELP_LIBRARY"
-    ])
-    cpp.includePaths: [
-        "../../shared/help",
-        ".",
-        "..",
-        "../..",
-        "../../libs",
-        buildDirectory
-    ]
+    cpp.defines: base.concat("QT_CLUCENE_SUPPORT")
+    cpp.includePaths: base.concat("../../shared/help")
 
     files: [
+        "centralwidget.cpp",
         "centralwidget.h",
+        "docsettingspage.cpp",
         "docsettingspage.h",
+        "docsettingspage.ui",
+        "externalhelpwindow.cpp",
+        "externalhelpwindow.h",
+        "filtersettingspage.cpp",
         "filtersettingspage.h",
+        "filtersettingspage.ui",
+        "generalsettingspage.cpp",
         "generalsettingspage.h",
+        "generalsettingspage.ui",
+        "help.qrc",
         "help_global.h",
         "helpconstants.h",
+        "helpfindsupport.cpp",
         "helpfindsupport.h",
+        "helpindexfilter.cpp",
         "helpindexfilter.h",
-        "localhelpmanager.h",
+        "helpmode.cpp",
         "helpmode.h",
+        "helpplugin.cpp",
         "helpplugin.h",
+        "helpviewer.cpp",
         "helpviewer.h",
         "helpviewer_p.h",
-        "openpagesmanager.h",
-        "openpagesmodel.h",
-        "openpagesswitcher.h",
-        "openpageswidget.h",
-        "remotehelpfilter.h",
-        "searchwidget.h",
-        "xbelsupport.h",
-        "externalhelpwindow.h",
-        "centralwidget.cpp",
-        "docsettingspage.cpp",
-        "filtersettingspage.cpp",
-        "generalsettingspage.cpp",
-        "helpfindsupport.cpp",
-        "helpindexfilter.cpp",
-        "localhelpmanager.cpp",
-        "helpmode.cpp",
-        "helpplugin.cpp",
-        "helpviewer.cpp",
         "helpviewer_qtb.cpp",
         "helpviewer_qwv.cpp",
+        "localhelpmanager.cpp",
+        "localhelpmanager.h",
         "openpagesmanager.cpp",
+        "openpagesmanager.h",
         "openpagesmodel.cpp",
+        "openpagesmodel.h",
         "openpagesswitcher.cpp",
+        "openpagesswitcher.h",
         "openpageswidget.cpp",
+        "openpageswidget.h",
         "remotehelpfilter.cpp",
+        "remotehelpfilter.h",
+        "remotehelpfilter.ui",
         "searchwidget.cpp",
+        "searchwidget.h",
         "xbelsupport.cpp",
-        "externalhelpwindow.cpp",
-        "docsettingspage.ui",
-        "filtersettingspage.ui",
-        "generalsettingspage.ui",
-        "remotehelpfilter.ui",
-        "help.qrc",
-        "../../shared/help/bookmarkmanager.h",
-        "../../shared/help/contentwindow.h",
-        "../../shared/help/filternamedialog.h",
-        "../../shared/help/indexwindow.h",
-        "../../shared/help/topicchooser.h",
+        "xbelsupport.h",
+        "../../shared/help/bookmarkdialog.ui",
         "../../shared/help/bookmarkmanager.cpp",
+        "../../shared/help/bookmarkmanager.h",
         "../../shared/help/contentwindow.cpp",
+        "../../shared/help/contentwindow.h",
         "../../shared/help/filternamedialog.cpp",
+        "../../shared/help/filternamedialog.h",
+        "../../shared/help/filternamedialog.ui",
         "../../shared/help/indexwindow.cpp",
+        "../../shared/help/indexwindow.h",
         "../../shared/help/topicchooser.cpp",
-        "../../shared/help/bookmarkdialog.ui",
-        "../../shared/help/filternamedialog.ui",
-        "../../shared/help/topicchooser.ui"
+        "../../shared/help/topicchooser.h",
+        "../../shared/help/topicchooser.ui",
     ]
 }
-
diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp
index d6242eaacd..1016ed38eb 100644
--- a/src/plugins/help/helpindexfilter.cpp
+++ b/src/plugins/help/helpindexfilter.cpp
@@ -46,8 +46,11 @@ Q_DECLARE_METATYPE(ILocatorFilter*)
 
 HelpIndexFilter::HelpIndexFilter()
 {
+    setId("HelpIndexFilter");
+    setDisplayName(tr("Help Index"));
     setIncludedByDefault(false);
     setShortcutString(QString(QLatin1Char('?')));
+
     m_icon = QIcon(QLatin1String(":/help/images/bookmark.png"));
 }
 
@@ -55,21 +58,6 @@ HelpIndexFilter::~HelpIndexFilter()
 {
 }
 
-QString HelpIndexFilter::displayName() const
-{
-    return tr("Help Index");
-}
-
-QString HelpIndexFilter::id() const
-{
-    return QLatin1String("HelpIndexFilter");
-}
-
-ILocatorFilter::Priority HelpIndexFilter::priority() const
-{
-    return Medium;
-}
-
 QList<FilterEntry> HelpIndexFilter::matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &entry)
 {
     QStringList keywords;
diff --git a/src/plugins/help/helpindexfilter.h b/src/plugins/help/helpindexfilter.h
index f10b03b134..5658246e14 100644
--- a/src/plugins/help/helpindexfilter.h
+++ b/src/plugins/help/helpindexfilter.h
@@ -46,9 +46,6 @@ public:
     ~HelpIndexFilter();
 
     // ILocatorFilter
-    QString displayName() const;
-    QString id() const;
-    Priority priority() const;
     QList<Locator::FilterEntry> matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &entry);
     void accept(Locator::FilterEntry selection) const;
     void refresh(QFutureInterface<void> &future);
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index bad80291d8..9dae8e2d71 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);
@@ -363,7 +364,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
     connect(remoteHelpFilter, SIGNAL(linkActivated(QUrl)), this,
         SLOT(switchToHelpMode(QUrl)));
 
-    QDesktopServices::setUrlHandler("qthelp", this, "handleHelpRequest");
+    QDesktopServices::setUrlHandler(QLatin1String("qthelp"), this, "handleHelpRequest");
     connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*,
         Core::IMode*)), this, SLOT(modeChanged(Core::IMode*,Core::IMode*)));
 
@@ -461,7 +462,7 @@ void HelpPlugin::setupUi()
 
     ContentWindow *contentWindow = new ContentWindow();
     contentWindow->setWindowTitle(tr(SB_CONTENTS));
-    m_contentItem = new Core::SideBarItem(contentWindow, SB_CONTENTS);
+    m_contentItem = new Core::SideBarItem(contentWindow, QLatin1String(SB_CONTENTS));
     connect(contentWindow, SIGNAL(linkActivated(QUrl)), m_centralWidget,
         SLOT(setSource(QUrl)));
 
@@ -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);
@@ -929,7 +930,7 @@ void HelpPlugin::activateContext()
                 "available.</center></body></html>").arg(m_idFromContext));
         } else {
             int version = 0;
-            QRegExp exp("(\\d+)");
+            QRegExp exp(QLatin1String("(\\d+)"));
             QUrl source = *links.begin();
             const QLatin1String qtRefDoc = QLatin1String("com.trolltech.qt");
 
@@ -1167,15 +1168,14 @@ void HelpPlugin::handleHelpRequest(const QUrl &url)
 
     QString address = url.toString();
     if (!Core::HelpManager::instance()->findFile(url).isValid()) {
-        if (address.startsWith(HelpViewer::NsNokia)
-            || address.startsWith(HelpViewer::NsTrolltech)) {
+        if (address.startsWith(QLatin1String("qthelp://com.nokia."))
+            || address.startsWith(QLatin1String("qthelp://com.trolltech."))) {
                 // local help not installed, resort to external web help
                 QString urlPrefix = QLatin1String("http://doc.qt.digia.com/");
-                if (url.authority() == QLatin1String("com.nokia.qtcreator")) {
+                if (url.authority() == QLatin1String("com.nokia.qtcreator"))
                     urlPrefix.append(QString::fromLatin1("qtcreator"));
-                } else {
+                else
                     urlPrefix.append(QLatin1String("latest"));
-                }
             address = urlPrefix + address.mid(address.lastIndexOf(QLatin1Char('/')));
         }
     }
@@ -1243,12 +1243,12 @@ void HelpPlugin::slotOpenActionUrl(QAction *action)
 
 void HelpPlugin::slotOpenSupportPage()
 {
-    switchToHelpMode(QUrl("qthelp://com.nokia.qtcreator/doc/technical-support.html"));
+    switchToHelpMode(QUrl(QLatin1String("qthelp://com.nokia.qtcreator/doc/technical-support.html")));
 }
 
 void HelpPlugin::slotReportBug()
 {
-    QDesktopServices::openUrl(QUrl("https://bugreports.qt-project.org"));
+    QDesktopServices::openUrl(QUrl(QLatin1String("https://bugreports.qt-project.org")));
 }
 
 void HelpPlugin::openFindToolBar()
@@ -1278,7 +1278,7 @@ void HelpPlugin::doSetupIfNeeded()
 int HelpPlugin::contextHelpOption() const
 {
     QSettings *settings = Core::ICore::settings();
-    const QString key = Help::Constants::ID_MODE_HELP + QLatin1String("/ContextHelpOption");
+    const QString key = QLatin1String(Help::Constants::ID_MODE_HELP) + QLatin1String("/ContextHelpOption");
     if (settings->contains(key))
         return settings->value(key, Help::Constants::SideBySideIfPossible).toInt();
 
diff --git a/src/plugins/help/helpviewer.cpp b/src/plugins/help/helpviewer.cpp
index 1471010e50..825f7b141f 100644
--- a/src/plugins/help/helpviewer.cpp
+++ b/src/plugins/help/helpviewer.cpp
@@ -48,18 +48,6 @@
 
 using namespace Help::Internal;
 
-const QString HelpViewer::NsNokia = QLatin1String("qthelp://com.nokia.");
-const QString HelpViewer::NsTrolltech = QLatin1String("qthelp://com.trolltech.");
-
-const QString HelpViewer::AboutBlankPage =
-    QCoreApplication::translate("HelpViewer", "<title>about:blank</title>");
-
-const QString HelpViewer::PageNotFoundMessage =
-    QCoreApplication::translate("HelpViewer", "<html><head><meta http-equiv=\""
-    "content-type\" content=\"text/html; charset=UTF-8\"><title>Error 404...</title>"
-    "</head><body><div align=\"center\"><br><br><h1>The page could not be found</h1>"
-    "<br><h3>'%1'</h3></div></body>");
-
 struct ExtensionMap {
     const char *extension;
     const char *mimeType;
diff --git a/src/plugins/help/helpviewer.h b/src/plugins/help/helpviewer.h
index d99a7f6fe7..6882aa92f8 100644
--- a/src/plugins/help/helpviewer.h
+++ b/src/plugins/help/helpviewer.h
@@ -85,11 +85,6 @@ public:
     bool findText(const QString &text, Find::FindFlags flags,
         bool incremental, bool fromSearch, bool *wrapped = 0);
 
-    static const QString NsNokia;
-    static const QString NsTrolltech;
-    static const QString AboutBlankPage;
-    static const QString PageNotFoundMessage;
-
     static bool isLocalUrl(const QUrl &url);
     static bool canOpenPage(const QString &url);
     static QString mimeFromUrl(const QUrl &url);
diff --git a/src/plugins/help/helpviewer_p.h b/src/plugins/help/helpviewer_p.h
index ff272b58ab..0115326442 100644
--- a/src/plugins/help/helpviewer_p.h
+++ b/src/plugins/help/helpviewer_p.h
@@ -49,7 +49,7 @@ public:
         : zoomCount(zoom)
         , forceFont(false)
         , lastAnchor(QString())
-        
+
     {}
 
     bool hasAnchorAt(QTextBrowser *browser, const QPoint& pos)
@@ -69,7 +69,7 @@ public:
 
     void openLink(bool newPage)
     {
-        if(lastAnchor.isEmpty())
+        if (lastAnchor.isEmpty())
             return;
         if (newPage)
             OpenPagesManager::instance().createPage(lastAnchor);
diff --git a/src/plugins/help/helpviewer_qtb.cpp b/src/plugins/help/helpviewer_qtb.cpp
index 0064882a74..45b0735ec5 100644
--- a/src/plugins/help/helpviewer_qtb.cpp
+++ b/src/plugins/help/helpviewer_qtb.cpp
@@ -35,6 +35,8 @@
 #include "helpviewer_p.h"
 #include "localhelpmanager.h"
 
+#include <utils/hostosinfo.h>
+
 #include <QApplication>
 #include <QClipboard>
 #include <QContextMenuEvent>
@@ -79,7 +81,7 @@ HelpViewer::~HelpViewer()
 QFont HelpViewer::viewerFont() const
 {
     const QHelpEngineCore &engine = LocalHelpManager::helpEngine();
-    return qVariantValue<QFont>(engine.customValue(QLatin1String("font"),
+    return qvariant_cast<QFont>(engine.customValue(QLatin1String("font"),
         qApp->font()));
 }
 
@@ -166,8 +168,14 @@ void HelpViewer::setSource(const QUrl &url)
     }
 
     QTextBrowser::setSource(url);
-    setHtml(string == Help::Constants::AboutBlank ? AboutBlankPage
-        : PageNotFoundMessage.arg(url.toString()));
+    setHtml(string == Help::Constants::AboutBlank
+        ? HelpViewer::tr("<title>about:blank</title>")
+        : HelpViewer::tr("<html><head><meta http-equiv=\""
+            "content-type\" content=\"text/html; charset=UTF-8\"><title>Error 404...</title>"
+            "</head><body><div align=\"center\"><br><br><h1>The page could not be found</h1>"
+            "<br><h3>'%1'</h3></div></body>")
+          .arg(url.toString()));
+
     emit loadFinished(true);
 }
 
@@ -285,19 +293,15 @@ void HelpViewer::wheelEvent(QWheelEvent *e)
 
 void HelpViewer::mousePressEvent(QMouseEvent *e)
 {
-#ifdef Q_OS_LINUX
-    if (handleForwardBackwardMouseButtons(e))
+    if (Utils::HostOsInfo::isLinuxHost() && handleForwardBackwardMouseButtons(e))
         return;
-#endif
     QTextBrowser::mousePressEvent(e);
 }
 
 void HelpViewer::mouseReleaseEvent(QMouseEvent *e)
 {
-#ifndef Q_OS_LINUX
-    if (handleForwardBackwardMouseButtons(e))
+    if (!Utils::HostOsInfo::isLinuxHost() && handleForwardBackwardMouseButtons(e))
         return;
-#endif
 
     bool controlPressed = e->modifiers() & Qt::ControlModifier;
     if ((controlPressed && d->hasAnchorAt(this, e->pos())) ||
diff --git a/src/plugins/help/helpviewer_qwv.cpp b/src/plugins/help/helpviewer_qwv.cpp
index b35407c36a..586e3908c4 100644
--- a/src/plugins/help/helpviewer_qwv.cpp
+++ b/src/plugins/help/helpviewer_qwv.cpp
@@ -36,6 +36,8 @@
 #include "localhelpmanager.h"
 #include "openpagesmanager.h"
 
+#include <utils/hostosinfo.h>
+
 #include <QDebug>
 #include <QFileInfo>
 #include <QString>
@@ -54,6 +56,8 @@
 
 #include <utils/networkaccessmanager.h>
 
+#include <cstring>
+
 using namespace Find;
 using namespace Help;
 using namespace Help::Internal;
@@ -145,7 +149,7 @@ qint64 HelpNetworkReply::readData(char *buffer, qint64 maxlen)
 {
     qint64 len = qMin(qint64(data.length()), maxlen);
     if (len) {
-        qMemCopy(buffer, data.constData(), len);
+        std::memcpy(buffer, data.constData(), len);
         data.remove(0, len);
     }
     return len;
@@ -329,7 +333,7 @@ HelpViewer::HelpViewer(qreal zoom, QWidget *parent)
     connect(page(), SIGNAL(printRequested(QWebFrame*)), this, SIGNAL(printRequested()));
 
     setViewerFont(viewerFont());
-    setTextSizeMultiplier(zoom == 0.0 ? 1.0 : zoom);
+    setZoomFactor(zoom == 0.0 ? 1.0 : zoom);
 }
 
 HelpViewer::~HelpViewer()
@@ -342,7 +346,7 @@ QFont HelpViewer::viewerFont() const
     QFont font(QApplication::font().family(),
         webSettings->fontSize(QWebSettings::DefaultFontSize));
     const QHelpEngineCore &engine = LocalHelpManager::helpEngine();
-    return qVariantValue<QFont>(engine.customValue(QLatin1String("font"),
+    return qvariant_cast<QFont>(engine.customValue(QLatin1String("font"),
         font));
 }
 
@@ -355,22 +359,22 @@ void HelpViewer::setViewerFont(const QFont &font)
 
 void HelpViewer::scaleUp()
 {
-    setTextSizeMultiplier(textSizeMultiplier() + 0.1);
+    setZoomFactor(zoomFactor() + 0.1);
 }
 
 void HelpViewer::scaleDown()
 {
-    setTextSizeMultiplier(qMax(qreal(0.0), textSizeMultiplier() - qreal(0.1)));
+    setZoomFactor(qMax(qreal(0.0), zoomFactor() - qreal(0.1)));
 }
 
 void HelpViewer::resetScale()
 {
-    setTextSizeMultiplier(1.0);
+    setZoomFactor(1.0);
 }
 
 qreal HelpViewer::scale() const
 {
-    return textSizeMultiplier();
+    return zoomFactor();
 }
 
 QString HelpViewer::title() const
@@ -480,10 +484,8 @@ void HelpViewer::wheelEvent(QWheelEvent *event)
 
 void HelpViewer::mousePressEvent(QMouseEvent *event)
 {
-#ifdef Q_OS_LINUX
-    if (handleForwardBackwardMouseButtons(event))
+    if (Utils::HostOsInfo::isLinuxHost() && handleForwardBackwardMouseButtons(event))
         return;
-#endif
 
     if (HelpPage *currentPage = static_cast<HelpPage*> (page())) {
         currentPage->m_pressedButtons = event->buttons();
@@ -495,10 +497,8 @@ void HelpViewer::mousePressEvent(QMouseEvent *event)
 
 void HelpViewer::mouseReleaseEvent(QMouseEvent *event)
 {
-#ifndef Q_OS_LINUX
-    if (handleForwardBackwardMouseButtons(event))
+    if (!Utils::HostOsInfo::isLinuxHost() && handleForwardBackwardMouseButtons(event))
         return;
-#endif
 
     QWebView::mouseReleaseEvent(event);
 }
diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp
index 0beb4fa6d1..0182ee3bee 100644
--- a/src/plugins/help/localhelpmanager.cpp
+++ b/src/plugins/help/localhelpmanager.cpp
@@ -87,7 +87,7 @@ QHelpEngine &LocalHelpManager::helpEngine()
     if (!m_guiEngine) {
         QMutexLocker _(&m_guiMutex);
         if (!m_guiEngine) {
-            m_guiEngine = new QHelpEngine("");
+            m_guiEngine = new QHelpEngine(QString());
             m_guiEngine->setAutoSaveFilter(false);
         }
     }
diff --git a/src/plugins/help/openpagesmanager.cpp b/src/plugins/help/openpagesmanager.cpp
index 4bd309105b..f4cd9206bf 100644
--- a/src/plugins/help/openpagesmanager.cpp
+++ b/src/plugins/help/openpagesmanager.cpp
@@ -259,11 +259,10 @@ void OpenPagesManager::closePagesExcept(const QModelIndex &index)
         int i = 0;
         HelpViewer *viewer = m_model->pageAt(index.row());
         while (m_model->rowCount() > 1) {
-            if (m_model->pageAt(i) != viewer) {
+            if (m_model->pageAt(i) != viewer)
                 removePage(i);
-            } else {
+            else
                 i++;
-            }
         }
     }
 }
diff --git a/src/plugins/help/openpagesswitcher.cpp b/src/plugins/help/openpagesswitcher.cpp
index 3d47c0d255..b07e58bd9f 100644
--- a/src/plugins/help/openpagesswitcher.cpp
+++ b/src/plugins/help/openpagesswitcher.cpp
@@ -33,6 +33,8 @@
 #include "openpagesmodel.h"
 #include "openpageswidget.h"
 
+#include <utils/hostosinfo.h>
+
 #include <QEvent>
 
 #include <QKeyEvent>
@@ -53,9 +55,8 @@ OpenPagesSwitcher::OpenPagesSwitcher(OpenPagesModel *model)
 
     // We disable the frame on this list view and use a QFrame around it instead.
     // This improves the look with QGTKStyle.
-#ifndef Q_OS_MAC
-    setFrameStyle(m_openPagesWidget->frameStyle());
-#endif
+    if (!Utils::HostOsInfo::isMacHost())
+        setFrameStyle(m_openPagesWidget->frameStyle());
     m_openPagesWidget->setFrameStyle(QFrame::NoFrame);
 
     m_openPagesWidget->allowContextMenu(false);
@@ -124,11 +125,8 @@ bool OpenPagesSwitcher::eventFilter(QObject *object, QEvent *event)
                 emit setCurrentPage(m_openPagesWidget->currentIndex());
                 return true;
             }
-#ifdef Q_OS_MAC
-            const Qt::KeyboardModifier modifier = Qt::AltModifier;
-#else
-            const Qt::KeyboardModifier modifier = Qt::ControlModifier;
-#endif
+            const Qt::KeyboardModifiers modifier = Utils::HostOsInfo::isMacHost()
+                    ? Qt::AltModifier : Qt::ControlModifier;
             if (key == Qt::Key_Backtab
                 && (ke->modifiers() == (modifier | Qt::ShiftModifier)))
                 gotoNextPage();
diff --git a/src/plugins/help/remotehelpfilter.cpp b/src/plugins/help/remotehelpfilter.cpp
index 6e8fc28adb..5a1459cf7e 100644
--- a/src/plugins/help/remotehelpfilter.cpp
+++ b/src/plugins/help/remotehelpfilter.cpp
@@ -49,6 +49,8 @@ RemoteFilterOptions::RemoteFilterOptions(RemoteHelpFilter *filter, QWidget *pare
 
     connect(m_ui.add, SIGNAL(clicked()), this, SLOT(addNewItem()));
     connect(m_ui.remove, SIGNAL(clicked()), this, SLOT(removeItem()));
+    connect(m_ui.listWidget, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), SLOT(updateRemoveButton()));
+    updateRemoveButton();
 }
 
 void RemoteFilterOptions::addNewItem()
@@ -57,6 +59,7 @@ void RemoteFilterOptions::addNewItem()
     m_ui.listWidget->addItem(item);
     item->setSelected(true);
     item->setFlags(item->flags() | Qt::ItemIsEditable);
+    m_ui.listWidget->setCurrentItem(item);
     m_ui.listWidget->editItem(item);
 }
 
@@ -68,12 +71,20 @@ void RemoteFilterOptions::removeItem()
     }
 }
 
+void RemoteFilterOptions::updateRemoveButton()
+{
+    m_ui.remove->setEnabled(m_ui.listWidget->currentItem());
+}
+
 // -- RemoteHelpFilter
 
 RemoteHelpFilter::RemoteHelpFilter()
 {
+    setId("RemoteHelpFilter");
+    setDisplayName(tr("Web Search"));
     setIncludedByDefault(false);
     setShortcutString(QLatin1String("r"));
+
     m_remoteUrls.append(QLatin1String("http://www.bing.com/search?q=%1"));
     m_remoteUrls.append(QLatin1String("http://www.google.com/search?q=%1"));
     m_remoteUrls.append(QLatin1String("http://search.yahoo.com/search?p=%1"));
@@ -85,21 +96,6 @@ RemoteHelpFilter::~RemoteHelpFilter()
 {
 }
 
-QString RemoteHelpFilter::displayName() const
-{
-    return tr("Web Search");
-}
-
-QString RemoteHelpFilter::id() const
-{
-    return QLatin1String("RemoteHelpFilter");
-}
-
-Locator::ILocatorFilter::Priority RemoteHelpFilter::priority() const
-{
-    return Medium;
-}
-
 QList<Locator::FilterEntry> RemoteHelpFilter::matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &pattern)
 {
     QList<Locator::FilterEntry> entries;
@@ -116,9 +112,8 @@ QList<Locator::FilterEntry> RemoteHelpFilter::matchesFor(QFutureInterface<Locato
 void RemoteHelpFilter::accept(Locator::FilterEntry selection) const
 {
     const QString &url = selection.displayName;
-    if (!url.isEmpty()) {
+    if (!url.isEmpty())
         emit linkActivated(url);
-    }
 }
 
 void RemoteHelpFilter::refresh(QFutureInterface<void> &future)
diff --git a/src/plugins/help/remotehelpfilter.h b/src/plugins/help/remotehelpfilter.h
index 4f70d6781a..4bcb0c8ed6 100644
--- a/src/plugins/help/remotehelpfilter.h
+++ b/src/plugins/help/remotehelpfilter.h
@@ -47,9 +47,6 @@ public:
     ~RemoteHelpFilter();
 
     // ILocatorFilter
-    QString displayName() const;
-    QString id() const;
-    Priority priority() const;
     QList<Locator::FilterEntry> matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &entry);
     void accept(Locator::FilterEntry selection) const;
     void refresh(QFutureInterface<void> &future);
@@ -78,6 +75,7 @@ public:
 private slots:
     void addNewItem();
     void removeItem();
+    void updateRemoveButton();
 
 private:
     RemoteHelpFilter *m_filter;
diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp
index 98fa67c0d5..25f5b8ade8 100644
--- a/src/plugins/help/searchwidget.cpp
+++ b/src/plugins/help/searchwidget.cpp
@@ -67,7 +67,7 @@ SearchWidget::~SearchWidget()
 
 void SearchWidget::zoomIn()
 {
-    QTextBrowser* browser = qFindChild<QTextBrowser*>(resultWidget);
+    QTextBrowser* browser = resultWidget->findChild<QTextBrowser*>();
     if (browser && zoomCount != 10) {
         zoomCount++;
         browser->zoomIn();
@@ -76,7 +76,7 @@ void SearchWidget::zoomIn()
 
 void SearchWidget::zoomOut()
 {
-    QTextBrowser* browser = qFindChild<QTextBrowser*>(resultWidget);
+    QTextBrowser* browser = resultWidget->findChild<QTextBrowser*>();
     if (browser && zoomCount != -5) {
         zoomCount--;
         browser->zoomOut();
@@ -88,7 +88,7 @@ void SearchWidget::resetZoom()
     if (zoomCount == 0)
         return;
 
-    QTextBrowser* browser = qFindChild<QTextBrowser*>(resultWidget);
+    QTextBrowser* browser = resultWidget->findChild<QTextBrowser*>();
     if (browser) {
         browser->zoomOut(zoomCount);
         zoomCount = 0;
@@ -135,7 +135,7 @@ void SearchWidget::showEvent(QShowEvent *event)
         connect(searchEngine, SIGNAL(searchingFinished(int)), this,
             SLOT(searchingFinished(int)));
 
-        QTextBrowser* browser = qFindChild<QTextBrowser*>(resultWidget);
+        QTextBrowser* browser = resultWidget->findChild<QTextBrowser*>();
         browser->viewport()->installEventFilter(this);
 
         connect(searchEngine, SIGNAL(indexingStarted()), this,
@@ -214,7 +214,7 @@ void SearchWidget::indexingFinished()
 
 bool SearchWidget::eventFilter(QObject *o, QEvent *e)
 {
-    QTextBrowser *browser = qFindChild<QTextBrowser *>(resultWidget);
+    QTextBrowser *browser = resultWidget->findChild<QTextBrowser *>();
     if (browser && o == browser->viewport()
         && e->type() == QEvent::MouseButtonRelease){
         QMouseEvent *me = static_cast<QMouseEvent *>(e);
@@ -232,7 +232,7 @@ bool SearchWidget::eventFilter(QObject *o, QEvent *e)
 
 void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent)
 {
-    QTextBrowser *browser = qFindChild<QTextBrowser *>(resultWidget);
+    QTextBrowser *browser = resultWidget->findChild<QTextBrowser *>();
     if (!browser)
         return;
 
@@ -259,11 +259,10 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent)
     }
 
     QAction *usedAction = menu.exec(mapToGlobal(contextMenuEvent->pos()));
-    if (usedAction == openLink) {
+    if (usedAction == openLink)
         browser->selectAll();
-    } else if (usedAction == openLinkInNewTab) {
+    else if (usedAction == openLinkInNewTab)
         OpenPagesManager::instance().createPageFromSearch(link);
-    } else if (usedAction == copyAnchorAction) {
+    else if (usedAction == copyAnchorAction)
         QApplication::clipboard()->setText(link.toString());
-    }
 }