From f50da028806b1216d099dbbaa023574f27a8d340 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 19 Jun 2019 18:06:48 +0200
Subject: [PATCH] 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>
---
 src/plugins/baremetal/baremetaldevice.cpp | 5 ++++-
 src/plugins/baremetal/baremetaldevice.h   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plugins/baremetal/baremetaldevice.cpp b/src/plugins/baremetal/baremetaldevice.cpp
index e543615aeec..350c233ed08 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 ee1b186d1ce..31ac572adcc 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;