feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

HelpPlugin: simplify createHelpViewer

Browse Source 
and remove stale define

Change-Id: I8f47c539457577faee13320f88709b60deee90ea
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Nikita Baryshnikov
2014-12-17 19:12:56 +03:00
committed by Eike Ziller
parent 5d2d37b794
commit 5a40c071a4
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/help/helpplugin.cpp
View File

@@ -99,8 +99,6 @@ using namespace Help::Internal;
static const char kExternalWindowStateKey[] = "Help/ExternalWindowState"; static const char kExternalWindowStateKey[] = "Help/ExternalWindowState";
#define IMAGEPATH ":/help/images/"
using namespace Core; using namespace Core;
using namespace Utils; using namespace Utils;
@@ -364,17 +362,14 @@ HelpViewer *HelpPlugin::createHelpViewer(qreal zoom)
viewer = new MacWebKitHelpViewer(zoom); viewer = new MacWebKitHelpViewer(zoom);
#else #else
qWarning() << "native help viewer is requested, but was not enabled during compilation"; qWarning() << "native help viewer is requested, but was not enabled during compilation";
viewer = new TextBrowserHelpViewer(zoom);
#endif #endif
} else if (backend.compare(QLatin1String("textbrowser"), Qt::CaseInsensitive) == 0) { } else if (backend.compare(QLatin1String("textbrowser"), Qt::CaseInsensitive) != 0) {
viewer = new TextBrowserHelpViewer(zoom);
} else {
#ifndef QT_NO_WEBKIT #ifndef QT_NO_WEBKIT
viewer = new QtWebKitHelpViewer(zoom); viewer = new QtWebKitHelpViewer(zoom);
#else
viewer = new TextBrowserHelpViewer(zoom);
#endif #endif
} }
if (!viewer)
viewer = new TextBrowserHelpViewer(zoom);
// initialize font // initialize font
QVariant fontSetting = LocalHelpManager::engineFontSettings(); QVariant fontSetting = LocalHelpManager::engineFontSettings();