diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-01-30 12:38:57 +0100 |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2012-01-30 18:18:16 +0100 |
| commit | 0651e28d04933647740b92322fe8f7f279cb6954 (patch) | |
| tree | 66645cc260985d5bd42fc6ea2f7181c89b40f42c /src | |
| parent | a8f97a7a1805359261049df83fc4ad7ba4249a29 (diff) | |
| download | qt-creator-0651e28d04933647740b92322fe8f7f279cb6954.tar.gz | |
Delay setting up the help manager.
Change-Id: I86ba3734bd9a64b7d13ce7b7171a65eeb82dfa3d
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/coreplugin/helpmanager.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/coreplugin/helpmanager.h | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/helpmanager.cpp b/src/plugins/coreplugin/helpmanager.cpp index 6df6131b04..f32032488b 100644 --- a/src/plugins/coreplugin/helpmanager.cpp +++ b/src/plugins/coreplugin/helpmanager.cpp @@ -40,6 +40,7 @@ #include <QtCore/QDir> #include <QtCore/QFileInfo> #include <QtCore/QStringList> +#include <QtCore/QTimer> #include <QtHelp/QHelpEngineCore> @@ -90,7 +91,7 @@ HelpManager::HelpManager(QObject *parent) : { Q_ASSERT(!m_instance); m_instance = this; - connect(Core::ICore::instance(), SIGNAL(coreOpened()), SLOT(setupHelpManager())); + connect(Core::ICore::instance(), SIGNAL(coreOpened()), SLOT(delayedSetupHelpManager())); } HelpManager::~HelpManager() @@ -101,6 +102,11 @@ HelpManager::~HelpManager() delete d; } +void HelpManager::delayedSetupHelpManager() +{ + QTimer::singleShot(100, this, SLOT(setupHelpManager())); +} + HelpManager *HelpManager::instance() { Q_ASSERT(m_instance); @@ -402,7 +408,6 @@ void HelpManager::setupHelpManager() d->m_helpEngine->setAutoSaveFilter(false); d->m_helpEngine->setCurrentFilter(tr("Unfiltered")); d->m_helpEngine->setupData(); - verifyDocumenation(); if (!d->m_nameSpacesToUnregister.isEmpty()) { diff --git a/src/plugins/coreplugin/helpmanager.h b/src/plugins/coreplugin/helpmanager.h index 9ae0c7d338..f72faa5d20 100644 --- a/src/plugins/coreplugin/helpmanager.h +++ b/src/plugins/coreplugin/helpmanager.h @@ -92,6 +92,7 @@ signals: void helpRequested(const QUrl &url); private slots: + void delayedSetupHelpManager(); void setupHelpManager(); private: |