aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2023-02-27 17:16:21 +0100
committerhjk <hjk@qt.io>2023-02-28 16:43:00 +0000
commit824ae57fd9b909de23b04326986e4393ec500cc5 (patch)
tree77e419b7f5e7f350f898ba6f3537fb93cd929c88
parentcace5a57f2a372e5879e12ff0b5d5781f513969b (diff)
Qnx: Further delay configuration restoringv10.0.0-beta2
For toolchains-on-device scenarios we need the devices. Change-Id: I83547b8c342c87c1c83ed432432f8d151d7e3f1d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/plugins/qnx/qnxplugin.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp
index 25262c394f..c6664b9f60 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);