Commit f8a1e343 authored by Eike Ziller's avatar Eike Ziller

Fix registration of Qt documentation

Restoring project explorer related information was delayed, including
tool chains, which triggers restoring Qt versions. Qt documentation was
registered in QtSupport's delayedInitialize which comes before
ProjectExplorer's delayedInitialize, so no Qt versions were found to
register documentation for.

Register documentation in QtVersionManager::triggerQtVersionRestore
instead.

Change-Id: Ia36f4d89672f2c651157dee50c3e8996af55598c
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
parent 95a6e242
......@@ -123,8 +123,3 @@ void QtSupportPlugin::extensionsInitialized()
"You probably want %1 instead.").arg(QString::fromLatin1(kHostBins)),
[]() { return qmakeProperty("QT_INSTALL_BINS"); });
}
bool QtSupportPlugin::delayedInitialize()
{
return QtVersionManager::delayedInitialize();
}
......@@ -41,7 +41,6 @@ class QtSupportPlugin : public ExtensionSystem::IPlugin
public:
bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
bool delayedInitialize();
#ifdef WITH_TESTS
private slots:
......
......@@ -147,12 +147,8 @@ void QtVersionManager::triggerQtVersionRestore()
m_configFileWatcher->addFile(configFileName.toString(),
FileSystemWatcher::WatchModifiedDate);
} // exists
}
bool QtVersionManager::delayedInitialize()
{
updateDocumentation();
return true;
}
bool QtVersionManager::isLoaded()
......
......@@ -42,7 +42,6 @@ public:
QtVersionManager();
~QtVersionManager();
static void initialized();
static bool delayedInitialize();
static bool isLoaded();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment