diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2014-09-19 13:48:07 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-09-19 16:06:51 +0200 |
commit | 378d04837cb0033031f26269b1194855870ee1d6 (patch) | |
tree | 250d3b146b3d50f2f82675d686a94b89d5ae063e /src/assistant/help/qhelpenginecore.cpp | |
parent | cd1ded8465f2e5c3da7edf1a38b3b5b3d6a6b1cd (diff) |
Fix crash when accessing the content model.
1) Make sure invalidateContents() is called whenever the help engine's
DB readers are destroyed.
2) In QHelpContentProvider::stopCollecting(), remove all root items, as
they are invalid now: Their child items reference DB readers that
are going to be destroyed.
Task-number: QTBUG-18829
Change-Id: Id9cc4ea99c43c36ad5c5d1f04157a68bac79d44a
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src/assistant/help/qhelpenginecore.cpp')
-rw-r--r-- | src/assistant/help/qhelpenginecore.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/assistant/help/qhelpenginecore.cpp b/src/assistant/help/qhelpenginecore.cpp index a2aeb73ed..3d5ba60a1 100644 --- a/src/assistant/help/qhelpenginecore.cpp +++ b/src/assistant/help/qhelpenginecore.cpp @@ -79,6 +79,7 @@ QHelpEngineCorePrivate::~QHelpEngineCorePrivate() void QHelpEngineCorePrivate::clearMaps() { + emit q->readersAboutToBeInvalidated(); QMap<QString, QHelpDBReader*>::iterator it = readerMap.begin(); while (it != readerMap.end()) { delete it.value(); |