From ddf421482c2e749d1f730e4633bb4d61b0a6411e Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Mon, 22 Mar 2010 11:25:57 +0100
Subject: [PATCH] Fix compile error while using QTextBrowser as help viewer.
Reviewed-by: Thorbjorn
---
src/shared/help/helpviewer.cpp | 13 ++++++++-----
src/shared/help/helpviewer.h | 1 +
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/shared/help/helpviewer.cpp b/src/shared/help/helpviewer.cpp
index ef8a9cd28a0..aae50b2ec99 100644
--- a/src/shared/help/helpviewer.cpp
+++ b/src/shared/help/helpviewer.cpp
@@ -572,6 +572,14 @@ bool HelpViewer::handleForwardBackwardMouseButtons(QMouseEvent *e)
return false;
}
+void HelpViewer::mousePressEvent(QMouseEvent *e)
+{
+#ifdef Q_OS_LINUX
+ if (handleForwardBackwardMouseButtons(e))
+ return;
+#endif
+}
+
void HelpViewer::mouseReleaseEvent(QMouseEvent *e)
{
#ifndef Q_OS_LINUX
@@ -591,11 +599,6 @@ void HelpViewer::mouseReleaseEvent(QMouseEvent *e)
void HelpViewer::keyPressEvent(QKeyEvent *e)
{
-#ifdef Q_OS_LINUX
- if (handleForwardBackwardMouseButtons(e))
- return;
-#endif
-
if ((e->key() == Qt::Key_Home && e->modifiers() != Qt::NoModifier)
|| (e->key() == Qt::Key_End && e->modifiers() != Qt::NoModifier)) {
QKeyEvent* event = new QKeyEvent(e->type(), e->key(), Qt::NoModifier,
diff --git a/src/shared/help/helpviewer.h b/src/shared/help/helpviewer.h
index f5badef6a2e..32ad060d276 100644
--- a/src/shared/help/helpviewer.h
+++ b/src/shared/help/helpviewer.h
@@ -158,6 +158,7 @@ private:
void openLinkInNewTab(const QString &link);
bool hasAnchorAt(const QPoint& pos);
void contextMenuEvent(QContextMenuEvent *e);
+ void mousePressEvent(QMouseEvent *e);
void mouseReleaseEvent(QMouseEvent *e);
void keyPressEvent(QKeyEvent *e);
--
GitLab