feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Delay setting up the help manager.

Browse Source 
Change-Id: I86ba3734bd9a64b7d13ce7b7171a65eeb82dfa3d
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
This commit is contained in:
Eike Ziller
2012-01-30 12:38:57 +01:00
committed by hjk
parent a8f97a7a18
commit 0651e28d04
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/coreplugin/helpmanager.cpp
View File

@@ -40,6 +40,7 @@
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QTimer>
#include <QtHelp/QHelpEngineCore> #include <QtHelp/QHelpEngineCore>
@@ -90,7 +91,7 @@ HelpManager::HelpManager(QObject *parent) :
{ {
Q_ASSERT(!m_instance); Q_ASSERT(!m_instance);
m_instance = this; m_instance = this;
connect(Core::ICore::instance(), SIGNAL(coreOpened()), SLOT(setupHelpManager())); connect(Core::ICore::instance(), SIGNAL(coreOpened()), SLOT(delayedSetupHelpManager()));
} }
HelpManager::~HelpManager() HelpManager::~HelpManager()
@@ -101,6 +102,11 @@ HelpManager::~HelpManager()
delete d; delete d;
} }
void HelpManager::delayedSetupHelpManager()
{
QTimer::singleShot(100, this, SLOT(setupHelpManager()));
}
HelpManager *HelpManager::instance() HelpManager *HelpManager::instance()
{ {
Q_ASSERT(m_instance); Q_ASSERT(m_instance);
@@ -402,7 +408,6 @@ void HelpManager::setupHelpManager()
d->m_helpEngine->setAutoSaveFilter(false); d->m_helpEngine->setAutoSaveFilter(false);
d->m_helpEngine->setCurrentFilter(tr("Unfiltered")); d->m_helpEngine->setCurrentFilter(tr("Unfiltered"));
d->m_helpEngine->setupData(); d->m_helpEngine->setupData();
verifyDocumenation(); verifyDocumenation();
if (!d->m_nameSpacesToUnregister.isEmpty()) { if (!d->m_nameSpacesToUnregister.isEmpty()) {

1
src/plugins/coreplugin/helpmanager.h
View File

@@ -92,6 +92,7 @@ signals:
void helpRequested(const QUrl &url); void helpRequested(const QUrl &url);
private slots: private slots:
void delayedSetupHelpManager();
void setupHelpManager(); void setupHelpManager();
private: private: