diff options
Diffstat (limited to 'src/plugins/help/helpviewer_qtb.cpp')
| -rw-r--r-- | src/plugins/help/helpviewer_qtb.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/help/helpviewer_qtb.cpp b/src/plugins/help/helpviewer_qtb.cpp index 59cee629c8..65b56e1967 100644 --- a/src/plugins/help/helpviewer_qtb.cpp +++ b/src/plugins/help/helpviewer_qtb.cpp @@ -35,6 +35,8 @@ #include "helpviewer_p.h" #include "localhelpmanager.h" +#include <utils/hostosinfo.h> + #include <QApplication> #include <QClipboard> #include <QContextMenuEvent> @@ -79,7 +81,7 @@ HelpViewer::~HelpViewer() QFont HelpViewer::viewerFont() const { const QHelpEngineCore &engine = LocalHelpManager::helpEngine(); - return qVariantValue<QFont>(engine.customValue(QLatin1String("font"), + return qvariant_cast<QFont>(engine.customValue(QLatin1String("font"), qApp->font())); } @@ -285,19 +287,15 @@ void HelpViewer::wheelEvent(QWheelEvent *e) void HelpViewer::mousePressEvent(QMouseEvent *e) { -#ifdef Q_OS_LINUX - if (handleForwardBackwardMouseButtons(e)) + if (Utils::HostOsInfo::isLinuxHost() && handleForwardBackwardMouseButtons(e)) return; -#endif QTextBrowser::mousePressEvent(e); } void HelpViewer::mouseReleaseEvent(QMouseEvent *e) { -#ifndef Q_OS_LINUX - if (handleForwardBackwardMouseButtons(e)) + if (!Utils::HostOsInfo::isLinuxHost() && handleForwardBackwardMouseButtons(e)) return; -#endif bool controlPressed = e->modifiers() & Qt::ControlModifier; if ((controlPressed && d->hasAnchorAt(this, e->pos())) || |