diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-12-12 17:47:33 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-12-13 09:29:05 +0000 |
| commit | c2bfdff70b4d539e719d7eb78a59ed4214b683f4 (patch) | |
| tree | d06fe65d99cde1ac356fb54e6af1b89a63741c7c | |
| parent | 49da199b10a87d0698e9f6ac3f8eafdc3c05bdc2 (diff) | |
| download | qt-creator-c2bfdff70b4d539e719d7eb78a59ed4214b683f4.tar.gz | |
WebAssembly: Ensure that the device is created after the kits are loaded
That way, the device of the WebAssembly Kit is correctly set if device
type and device of the kit were previously wrong.
Task-number: QTCREATORBUG-23360
Change-Id: I40b6650ede2e632fe5cc7cb27b576de8d1bfd066
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/plugins/webassembly/webassemblyplugin.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/webassembly/webassemblyplugin.cpp b/src/plugins/webassembly/webassemblyplugin.cpp index 97b4ca4ebc..497efeb722 100644 --- a/src/plugins/webassembly/webassemblyplugin.cpp +++ b/src/plugins/webassembly/webassemblyplugin.cpp @@ -35,6 +35,7 @@ #include <coreplugin/icore.h> #include <projectexplorer/devicesupport/devicemanager.h> +#include <projectexplorer/kitmanager.h> using namespace ProjectExplorer; @@ -80,7 +81,9 @@ bool WebAssemblyPlugin::initialize(const QStringList& arguments, QString* errorS void WebAssemblyPlugin::extensionsInitialized() { - ProjectExplorer::DeviceManager::instance()->addDevice(WebAssemblyDevice::create()); + connect(KitManager::instance(), &KitManager::kitsLoaded, this, [] { + DeviceManager::instance()->addDevice(WebAssemblyDevice::create()); + }); } } // namespace Internal |