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: Tobias Hunger <tobias.hunger@theqtcompany.com>

4 files changed, 0 insertions, 11 deletions

diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp
index 279776fdf1..2498d9cdcc 100644
--- a/src/plugins/qtsupport/qtsupportplugin.cpp
+++ b/src/plugins/qtsupport/qtsupportplugin.cpp
@@ -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();
-}
diff --git a/src/plugins/qtsupport/qtsupportplugin.h b/src/plugins/qtsupport/qtsupportplugin.h
index 743dd0db64..d8f9247143 100644
--- a/src/plugins/qtsupport/qtsupportplugin.h
+++ b/src/plugins/qtsupport/qtsupportplugin.h
@@ -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:
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 7c629856fa..640d4644e0 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -147,12 +147,8 @@ void QtVersionManager::triggerQtVersionRestore()
         m_configFileWatcher->addFile(configFileName.toString(),
                                      FileSystemWatcher::WatchModifiedDate);
     } // exists
-}
 
-bool QtVersionManager::delayedInitialize()
-{
     updateDocumentation();
-    return true;
 }
 
 bool QtVersionManager::isLoaded()
diff --git a/src/plugins/qtsupport/qtversionmanager.h b/src/plugins/qtsupport/qtversionmanager.h
index b226d42dd6..6333083878 100644
--- a/src/plugins/qtsupport/qtversionmanager.h
+++ b/src/plugins/qtsupport/qtversionmanager.h
@@ -42,7 +42,6 @@ public:
     QtVersionManager();
     ~QtVersionManager();
     static void initialized();
-    static bool delayedInitialize();
 
     static bool isLoaded();