forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -100,6 +100,7 @@ public:
|
|||||||
public slots:
|
public slots:
|
||||||
void copy();
|
void copy();
|
||||||
void home();
|
void home();
|
||||||
|
void stop();
|
||||||
|
|
||||||
void forward();
|
void forward();
|
||||||
void backward();
|
void backward();
|
||||||
|
@@ -249,6 +249,10 @@ void HelpViewer::copy()
|
|||||||
QTextBrowser::copy();
|
QTextBrowser::copy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void HelpViewer::stop()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void HelpViewer::forward()
|
void HelpViewer::forward()
|
||||||
{
|
{
|
||||||
QTextBrowser::forward();
|
QTextBrowser::forward();
|
||||||
|
@@ -492,6 +492,11 @@ void HelpViewer::copy()
|
|||||||
triggerPageAction(QWebPage::Copy);
|
triggerPageAction(QWebPage::Copy);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void HelpViewer::stop()
|
||||||
|
{
|
||||||
|
triggerPageAction(QWebPage::Stop);
|
||||||
|
}
|
||||||
|
|
||||||
void HelpViewer::forward()
|
void HelpViewer::forward()
|
||||||
{
|
{
|
||||||
QWebView::forward();
|
QWebView::forward();
|
||||||
|
@@ -87,6 +87,7 @@ void OpenPagesModel::removePage(int index)
|
|||||||
Q_ASSERT(index >= 0 && index < rowCount());
|
Q_ASSERT(index >= 0 && index < rowCount());
|
||||||
beginRemoveRows(QModelIndex(), index, index);
|
beginRemoveRows(QModelIndex(), index, index);
|
||||||
HelpViewer *page = m_pages.at(index);
|
HelpViewer *page = m_pages.at(index);
|
||||||
|
page->stop();
|
||||||
m_pages.removeAt(index);
|
m_pages.removeAt(index);
|
||||||
endRemoveRows();
|
endRemoveRows();
|
||||||
page->deleteLater();
|
page->deleteLater();
|
||||||
|
Reference in New Issue
Block a user