aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/help/helpviewer.h
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2014-10-20 17:22:46 +0200
committerEike Ziller <eike.ziller@theqtcompany.com>2014-10-21 16:50:26 +0200
commitccc6b09ccec18381940cca9502630333b280c8b8 (patch)
tree122358906d885cb250643c25b5c2d2e77a9e193d /src/plugins/help/helpviewer.h
parentc6ef3addcc73ebf69cf21b5ba947e59bd9587f15 (diff)
Help: Fix funny blank page when opening same URL again
For some reason the load() calls in the nested HelpViewer::setSource calls lead to even more nesting because webkit decides to cancel loading inbetween...... so we make the side bar viewer synchronization async on the event loop. Task-number: QTCREATORBUG-12742 Change-Id: I276272af7c477d627638e9611a34e80cca945b21 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'src/plugins/help/helpviewer.h')
-rw-r--r--src/plugins/help/helpviewer.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/help/helpviewer.h b/src/plugins/help/helpviewer.h
index e57f3e20b5..8672f53f88 100644
--- a/src/plugins/help/helpviewer.h
+++ b/src/plugins/help/helpviewer.h
@@ -59,7 +59,8 @@ public:
virtual QString title() const = 0;
virtual QUrl source() const = 0;
- virtual void setSource(const QUrl &url) = 0;
+ // metacall in HelpPlugin::updateSideBarSource
+ Q_INVOKABLE virtual void setSource(const QUrl &url) = 0;
virtual void scrollToAnchor(const QString &anchor) = 0;
virtual void highlightId(const QString &id) { Q_UNUSED(id) }