feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BareMetal: Fix recent constructor breakage

Browse Source 
Amends f420788465. The setDisplayType() call accidentally
ended up in the desctuctor, not the constructor

Change-Id: I63593325d0a6e3250c13b9e16781159190a238b1
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2019-06-19 18:06:48 +02:00
parent c7badbd701
commit f50da02880
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/baremetal/baremetaldevice.cpp
View File

@@ -50,10 +50,13 @@ const char gdbServerProviderIdKeyC[] = "GdbServerProviderId";
// BareMetalDevice // BareMetalDevice
BareMetalDevice::~BareMetalDevice() BareMetalDevice::BareMetalDevice()
{ {
setDisplayType(QCoreApplication::translate("BareMetal::Internal::BareMetalDevice", "Bare Metal")); setDisplayType(QCoreApplication::translate("BareMetal::Internal::BareMetalDevice", "Bare Metal"));
}
BareMetalDevice::~BareMetalDevice()
{
if (GdbServerProvider *provider = GdbServerProviderManager::findProvider(m_gdbServerProviderId)) if (GdbServerProvider *provider = GdbServerProviderManager::findProvider(m_gdbServerProviderId))
provider->unregisterDevice(this); provider->unregisterDevice(this);
} }

2
src/plugins/baremetal/baremetaldevice.h
View File

@@ -62,7 +62,7 @@ public:
QVariantMap toMap() const final; QVariantMap toMap() const final;
private: private:
explicit BareMetalDevice() = default; BareMetalDevice();
void setChannelByServerProvider(GdbServerProvider *provider); void setChannelByServerProvider(GdbServerProvider *provider);
QString m_gdbServerProviderId; QString m_gdbServerProviderId;