diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 91a1644e5ee..850f39c0b5f 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -1168,8 +1168,8 @@ 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"))
diff --git a/src/plugins/help/helpviewer.cpp b/src/plugins/help/helpviewer.cpp
index 09f8e8fff87..959b4605c41 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", "about:blank");
-
-const QString HelpViewer::PageNotFoundMessage =
- QCoreApplication::translate("HelpViewer", "Error 404..."
- "
The page could not be found
"
- "
'%1'
");
-
struct ExtensionMap {
const char *extension;
const char *mimeType;
diff --git a/src/plugins/help/helpviewer.h b/src/plugins/help/helpviewer.h
index 0b713752418..0a0aac1a7fb 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_qtb.cpp b/src/plugins/help/helpviewer_qtb.cpp
index 65b56e19678..0c649662e56 100644
--- a/src/plugins/help/helpviewer_qtb.cpp
+++ b/src/plugins/help/helpviewer_qtb.cpp
@@ -168,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("about:blank")
+ : HelpViewer::tr("Error 404..."
+ "
The page could not be found
"
+ "
'%1'
")
+ .arg(url.toString()));
+
emit loadFinished(true);
}