ProjectExplorer: reduce the perceived startup time

... by moving restoreKits to the delayed initialize phase.

Change-Id: If72e41b64ee71f2917b3f7a317d9887afc6e29e8
Reviewed-by: Eike Ziller <[email protected]>

1 files changed, 8 insertions, 3 deletions

diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 04c78ca205c..f2c8c59de2f 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1316,6 +1316,9 @@ static Kit *guessKitFromAbis(const Abis &abis)
 {
     Kit *kit = nullptr;
 
+    if (!KitManager::waitForLoaded())
+        return kit;
+
     // Try to find a kit via ABI.
     if (!abis.isEmpty()) {
         // Try exact abis.
@@ -1376,9 +1379,11 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
                         return false;
                     }
                 } else if (key == "kit") {
-                    kit = KitManager::kit(Id::fromString(val));
-                    if (!kit)
-                        kit = KitManager::kit(Utils::equal(&Kit::displayName, val));
+                    if (KitManager::waitForLoaded()) {
+                        kit = KitManager::kit(Id::fromString(val));
+                        if (!kit)
+                            kit = KitManager::kit(Utils::equal(&Kit::displayName, val));
+                    }
                 } else if (key == "server") {
                     startMode = AttachToRemoteServer;
                     remoteChannel = val;