diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-08-23 16:53:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-08-23 15:12:20 +0000 |
| commit | 119ff05ccc7c43bb00116a7e08ac070b77f4c627 (patch) | |
| tree | b9cefd4824bb2745c37d1b5be2e145d36378bd35 /src/plugins/help/helpviewer.h | |
| parent | 024cfda06cc4f4fb7112344ee7b27d2e1d99978d (diff) | |
Help: Make restoring override cursor more robust
Some help backends are not too consistent in how they send started and
finished signals (QtWebEngine I'm looking at you), so make restoring the
override cursor more robust in the base. As long as the backend reports
that it is finished, guarantee that all previous override cursors are
restored.
Also ensure override cursors are restored in case the viewer is
destroyed.
Task-number: QTCREATORBUG-17758
Change-Id: Icb1cd1eabfb232135a391a550d8e6719a74189eb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/help/helpviewer.h')
| -rw-r--r-- | src/plugins/help/helpviewer.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/help/helpviewer.h b/src/plugins/help/helpviewer.h index 488bb0bc5e..c98e8dbbfb 100644 --- a/src/plugins/help/helpviewer.h +++ b/src/plugins/help/helpviewer.h @@ -49,7 +49,7 @@ public: Q_DECLARE_FLAGS(Actions, Action) explicit HelpViewer(QWidget *parent = 0); - ~HelpViewer() { } + ~HelpViewer(); virtual QFont viewerFont() const = 0; virtual void setViewerFont(const QFont &font) = 0; @@ -109,7 +109,10 @@ protected: void slotLoadStarted(); void slotLoadFinished(); + void restoreOverrideCursor(); + Actions m_visibleActions = 0; + int m_loadOverrideStack = 0; }; } // namespace Internal |