From 824ae57fd9b909de23b04326986e4393ec500cc5 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 27 Feb 2023 17:16:21 +0100
Subject: [PATCH] Qnx: Further delay configuration restoring

For toolchains-on-device scenarios we need the devices.

Change-Id: I83547b8c342c87c1c83ed432432f8d151d7e3f1d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/qnx/qnxplugin.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp
index 25262c394fa..c6664b9f600 100644
--- a/src/plugins/qnx/qnxplugin.cpp
+++ b/src/plugins/qnx/qnxplugin.cpp
@@ -21,6 +21,7 @@
 #include <extensionsystem/iplugin.h>
 
 #include <projectexplorer/devicesupport/devicecheckbuildstep.h>
+#include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/projectexplorer.h>
@@ -122,8 +123,9 @@ private:
 
 void QnxPlugin::extensionsInitialized()
 {
-    // Can't do in init as not all devices are around.
-    d->configurationManager.restoreConfigurations();
+    // Can't do yet as not all devices are around.
+    connect(DeviceManager::instance(), &DeviceManager::devicesLoaded,
+            &d->configurationManager, &QnxConfigurationManager::restoreConfigurations);
 
     // Attach support
     connect(&d->m_attachToQnxApplication, &QAction::triggered, this, &showAttachToProcessDialog);