diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-04-02 10:25:46 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-04-13 07:19:38 +0000 |
commit | 7b8d670bd83cd0312573f91b0f6e406614b15b1a (patch) | |
tree | 85a7d376ec27a6b65393169199e33249d7cd8c93 /src/plugins/help | |
parent | b9ea4843053d617db653dec7d3d73ef8310853d6 (diff) | |
download | qt-creator-7b8d670bd83cd0312573f91b0f6e406614b15b1a.tar.gz |
Help: Fix that bookmarks were not restored
We have to make sure that the help engine is properly set up before
trying to read the bookmark data.
Change-Id: Id57cce5f538472eeac17b39a3640bf2ed77fa56a
Task-number: QTCREATORBUG-14106
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/help')
-rw-r--r-- | src/plugins/help/helpplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/help/localhelpmanager.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 5915c9f102..2ad2dbcbe0 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -30,6 +30,7 @@ #include "helpplugin.h" +#include "bookmarkmanager.h" #include "centralwidget.h" #include "docsettingspage.h" #include "filtersettingspage.h" @@ -668,6 +669,7 @@ void HelpPlugin::doSetupIfNeeded() resetFilter(); m_setupNeeded = false; OpenPagesManager::instance().setupInitialPages(); + LocalHelpManager::bookmarkManager().setupBookmarkModels(); } } diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp index 3603d6fbb8..96508149e7 100644 --- a/src/plugins/help/localhelpmanager.cpp +++ b/src/plugins/help/localhelpmanager.cpp @@ -140,10 +140,8 @@ BookmarkManager& LocalHelpManager::bookmarkManager() { if (!m_bookmarkManager) { QMutexLocker _(&m_bkmarkMutex); - if (!m_bookmarkManager) { + if (!m_bookmarkManager) m_bookmarkManager = new BookmarkManager; - m_bookmarkManager->setupBookmarkModels(); - } } return *m_bookmarkManager; } |