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

BareMetal: Replace name of GDB_PROVIDERS_SETTINGS_ID constant

Browse Source 
... with the DEBUG_SERVER_PROVIDERS_SETTINGS_ID name.

Reason is that this identifier includes not only the
GDB providers, it includes all possible provider types.

Change-Id: If545826aaf1606d33d4fec55653cd6e3ba2c5d61
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Denis Shienkov
2019-11-27 15:46:11 +03:00
parent e73a187246
commit 50fec43816
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ const char BareMetalOsType[] = "BareMetalOsType";
const char ACTION_ID[] = "BareMetal.Action"; const char ACTION_ID[] = "BareMetal.Action";
const char MENU_ID[] = "BareMetal.Menu"; const char MENU_ID[] = "BareMetal.Menu";
const char GDB_PROVIDERS_SETTINGS_ID[] = "EE.BareMetal.GdbServerProvidersOptions"; const char DEBUG_SERVER_PROVIDERS_SETTINGS_ID[] = "EE.BareMetal.DebugServerProvidersOptions";
// Debugger Server Provider Ids // Debugger Server Provider Ids
const char OPENOCD_PROVIDER_ID[] = "BareMetal.GdbServerProvider.OpenOcd"; const char OPENOCD_PROVIDER_ID[] = "BareMetal.GdbServerProvider.OpenOcd";

2
src/plugins/baremetal/debugserverproviderchooser.cpp
View File

@@ -82,7 +82,7 @@ void DebugServerProviderChooser::setCurrentProviderId(const QString &id)
void DebugServerProviderChooser::manageButtonClicked() void DebugServerProviderChooser::manageButtonClicked()
{ {
Core::ICore::showOptionsDialog(Constants::GDB_PROVIDERS_SETTINGS_ID, this); Core::ICore::showOptionsDialog(Constants::DEBUG_SERVER_PROVIDERS_SETTINGS_ID, this);
} }
void DebugServerProviderChooser::currentIndexChanged(int index) void DebugServerProviderChooser::currentIndexChanged(int index)

2
src/plugins/baremetal/debugserverproviderssettingspage.cpp
View File

@@ -447,7 +447,7 @@ QModelIndex DebugServerProvidersSettingsWidget::currentIndex() const
DebugServerProvidersSettingsPage::DebugServerProvidersSettingsPage() DebugServerProvidersSettingsPage::DebugServerProvidersSettingsPage()
{ {
setId(Constants::GDB_PROVIDERS_SETTINGS_ID); setId(Constants::DEBUG_SERVER_PROVIDERS_SETTINGS_ID);
setDisplayName(tr("Bare Metal")); setDisplayName(tr("Bare Metal"));
setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY); setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY);
} }