summaryrefslogtreecommitdiff
path: root/src/plugins/baremetal
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-06-19 18:06:48 +0200
committerhjk <hjk@qt.io>2019-06-20 12:04:46 +0000
commitf50da028806b1216d099dbbaa023574f27a8d340 (patch)
tree8b6a4b86a4f41c5d3dfeacbe176df11db39e8432 /src/plugins/baremetal
parentc7badbd701e7ad9a93695a1b943184b0102e1cca (diff)
downloadqt-creator-f50da028806b1216d099dbbaa023574f27a8d340.tar.gz
BareMetal: Fix recent constructor breakage
Amends f42078846545b. The setDisplayType() call accidentally ended up in the desctuctor, not the constructor Change-Id: I63593325d0a6e3250c13b9e16781159190a238b1 Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/baremetal')
-rw-r--r--src/plugins/baremetal/baremetaldevice.cpp5
-rw-r--r--src/plugins/baremetal/baremetaldevice.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/baremetal/baremetaldevice.cpp b/src/plugins/baremetal/baremetaldevice.cpp
index e543615aee..350c233ed0 100644
--- a/src/plugins/baremetal/baremetaldevice.cpp
+++ b/src/plugins/baremetal/baremetaldevice.cpp
@@ -50,10 +50,13 @@ const char gdbServerProviderIdKeyC[] = "GdbServerProviderId";
// BareMetalDevice
-BareMetalDevice::~BareMetalDevice()
+BareMetalDevice::BareMetalDevice()
{
setDisplayType(QCoreApplication::translate("BareMetal::Internal::BareMetalDevice", "Bare Metal"));
+}
+BareMetalDevice::~BareMetalDevice()
+{
if (GdbServerProvider *provider = GdbServerProviderManager::findProvider(m_gdbServerProviderId))
provider->unregisterDevice(this);
}
diff --git a/src/plugins/baremetal/baremetaldevice.h b/src/plugins/baremetal/baremetaldevice.h
index ee1b186d1c..31ac572adc 100644
--- a/src/plugins/baremetal/baremetaldevice.h
+++ b/src/plugins/baremetal/baremetaldevice.h
@@ -62,7 +62,7 @@ public:
QVariantMap toMap() const final;
private:
- explicit BareMetalDevice() = default;
+ BareMetalDevice();
void setChannelByServerProvider(GdbServerProvider *provider);
QString m_gdbServerProviderId;