diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:08:40 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:08:40 +0200 |
| commit | e69d4a9fd917d332c490a50e98b9802183afc478 (patch) | |
| tree | 5ac0115bc62bb5f84baa3f2b1b35a75ffe702b7d /src/assistant/help/qhelpenginecore.cpp | |
| parent | d55407822eefbc05f7d8bb44c53b057332b5b399 (diff) | |
| parent | a1751e3d586f1ebfb1770392e52d7c1648a7406f (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/assistant/assistant/mainwindow.cpp
src/linguist/linguist/mainwindow.cpp
src/qdbus/qdbusviewer/qdbusviewer.cpp
Change-Id: I1f5524ab747be561ed0b13d8b1fd8cb51a890363
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 00b55d078..f502e1df4 100644 --- a/src/assistant/help/qhelpenginecore.cpp +++ b/src/assistant/help/qhelpenginecore.cpp @@ -71,6 +71,7 @@ QHelpEngineCorePrivate::~QHelpEngineCorePrivate() void QHelpEngineCorePrivate::clearMaps() { + emit q->readersAboutToBeInvalidated(); QMap<QString, QHelpDBReader*>::iterator it = readerMap.begin(); while (it != readerMap.end()) { delete it.value(); |