summaryrefslogtreecommitdiff
path: root/src/plugins/help
diff options
context:
space:
mode:
authorNikita Baryshnikov <nib952051@gmail.com>2014-12-17 19:12:56 +0300
committerEike Ziller <eike.ziller@theqtcompany.com>2014-12-18 09:31:19 +0100
commit5a40c071a4c1f882179273f5bfbbd0478a52812d (patch)
treefec5b39734110fdabaa56d9bfc159ef15dee1cfb /src/plugins/help
parent5d2d37b7944ff7b2e3989590172a2a483c3cc1b7 (diff)
downloadqt-creator-5a40c071a4c1f882179273f5bfbbd0478a52812d.tar.gz
HelpPlugin: simplify createHelpViewer
and remove stale define Change-Id: I8f47c539457577faee13320f88709b60deee90ea Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/help')
-rw-r--r--src/plugins/help/helpplugin.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index a15a421256..c25613d7c1 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -99,8 +99,6 @@ using namespace Help::Internal;
static const char kExternalWindowStateKey[] = "Help/ExternalWindowState";
-#define IMAGEPATH ":/help/images/"
-
using namespace Core;
using namespace Utils;
@@ -364,17 +362,14 @@ HelpViewer *HelpPlugin::createHelpViewer(qreal zoom)
viewer = new MacWebKitHelpViewer(zoom);
#else
qWarning() << "native help viewer is requested, but was not enabled during compilation";
- viewer = new TextBrowserHelpViewer(zoom);
#endif
- } else if (backend.compare(QLatin1String("textbrowser"), Qt::CaseInsensitive) == 0) {
- viewer = new TextBrowserHelpViewer(zoom);
- } else {
+ } else if (backend.compare(QLatin1String("textbrowser"), Qt::CaseInsensitive) != 0) {
#ifndef QT_NO_WEBKIT
viewer = new QtWebKitHelpViewer(zoom);
-#else
- viewer = new TextBrowserHelpViewer(zoom);
#endif
}
+ if (!viewer)
+ viewer = new TextBrowserHelpViewer(zoom);
// initialize font
QVariant fontSetting = LocalHelpManager::engineFontSettings();