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

Help: Do not pass zoom factor to constructor

Browse Source 
Introduce HelpViewer::setScale instead

Change-Id: I9d50483bc1fa4de89de53db40eda348379bd0ae9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Eike Ziller
2014-12-18 11:36:49 +01:00
parent 6cafc424e8
commit ee63594182
8 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,23 +359,26 @@ HelpViewer *HelpPlugin::createHelpViewer(qreal zoom)
const QString backend = QLatin1String(qgetenv("QTC_HELPVIEWER_BACKEND"));
if (backend.compare(QLatin1String("native"), Qt::CaseInsensitive) == 0) {
#ifdef QTC_MAC_NATIVE_HELPVIEWER
viewer = new MacWebKitHelpViewer(zoom);
viewer = new MacWebKitHelpViewer();
#else
qWarning() << "native help viewer is requested, but was not enabled during compilation";
#endif
} else if (backend.compare(QLatin1String("textbrowser"), Qt::CaseInsensitive) != 0) {
#ifndef QT_NO_WEBKIT
viewer = new QtWebKitHelpViewer(zoom);
viewer = new QtWebKitHelpViewer();
#endif
}
if (!viewer)
viewer = new TextBrowserHelpViewer(zoom);
viewer = new TextBrowserHelpViewer();
// initialize font
QVariant fontSetting = LocalHelpManager::engineFontSettings();
if (fontSetting.isValid())
viewer->setViewerFont(fontSetting.value<QFont>());
// initialize zoom
viewer->setScale(zoom);
// add find support
Aggregation::Aggregate *agg = new Aggregation::Aggregate();
agg->add(viewer);