forked from qt-creator/qt-creator
HelpPlugin: simplify createHelpViewer
and remove stale define Change-Id: I8f47c539457577faee13320f88709b60deee90ea Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
committed by
Eike Ziller
parent
5d2d37b794
commit
5a40c071a4
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user