From ba185b833640747ad0ec2d45ca72c4602c8b1c66 Mon Sep 17 00:00:00 2001
From: kh1 <karsten.heimrich@nokia.com>
Date: Wed, 23 May 2012 16:14:12 +0200
Subject: [PATCH] Make sure we call stop before removing a page.
Fixes a spinning cursor in case the page was not fully
loaded and we where closing it at the same time.
Change-Id: Iae6efac70c0c8be2f84e6b1551275bbdf9c5aab3
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
---
src/plugins/help/helpviewer.h | 1 +
src/plugins/help/helpviewer_qtb.cpp | 4 ++++
src/plugins/help/helpviewer_qwv.cpp | 5 +++++
src/plugins/help/openpagesmodel.cpp | 1 +
4 files changed, 11 insertions(+)
diff --git a/src/plugins/help/helpviewer.h b/src/plugins/help/helpviewer.h
index 54a9eda1711..d39a2892226 100644
--- a/src/plugins/help/helpviewer.h
+++ b/src/plugins/help/helpviewer.h
@@ -100,6 +100,7 @@ public:
public slots:
void copy();
void home();
+ void stop();
void forward();
void backward();
diff --git a/src/plugins/help/helpviewer_qtb.cpp b/src/plugins/help/helpviewer_qtb.cpp
index 7420eb92b66..48058a9fce7 100644
--- a/src/plugins/help/helpviewer_qtb.cpp
+++ b/src/plugins/help/helpviewer_qtb.cpp
@@ -249,6 +249,10 @@ void HelpViewer::copy()
QTextBrowser::copy();
}
+void HelpViewer::stop()
+{
+}
+
void HelpViewer::forward()
{
QTextBrowser::forward();
diff --git a/src/plugins/help/helpviewer_qwv.cpp b/src/plugins/help/helpviewer_qwv.cpp
index 3e277a441bc..f93536eda8e 100644
--- a/src/plugins/help/helpviewer_qwv.cpp
+++ b/src/plugins/help/helpviewer_qwv.cpp
@@ -492,6 +492,11 @@ void HelpViewer::copy()
triggerPageAction(QWebPage::Copy);
}
+void HelpViewer::stop()
+{
+ triggerPageAction(QWebPage::Stop);
+}
+
void HelpViewer::forward()
{
QWebView::forward();
diff --git a/src/plugins/help/openpagesmodel.cpp b/src/plugins/help/openpagesmodel.cpp
index 669645278bc..d7f56bd7bab 100644
--- a/src/plugins/help/openpagesmodel.cpp
+++ b/src/plugins/help/openpagesmodel.cpp
@@ -87,6 +87,7 @@ void OpenPagesModel::removePage(int index)
Q_ASSERT(index >= 0 && index < rowCount());
beginRemoveRows(QModelIndex(), index, index);
HelpViewer *page = m_pages.at(index);
+ page->stop();
m_pages.removeAt(index);
endRemoveRows();
page->deleteLater();
--
GitLab