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

DeviceSettingsWidget: Don't leak QActions

Browse Source 
Amends 662aabd29f

Change-Id: I353a93b3b3752d639f9fc5d45467c843bed6a604
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Jarek Kobus
2024-03-12 13:10:39 +01:00
parent 7a769c59e7
commit c1015dde15
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
View File

@@ -77,7 +77,7 @@ private:
DeviceManager * const m_deviceManager; DeviceManager * const m_deviceManager;
DeviceManagerModel * const m_deviceManagerModel; DeviceManagerModel * const m_deviceManagerModel;
QList<QPushButton *> m_additionalActionButtons; QList<QPushButton *> m_additionalActionButtons;
IDeviceWidget *m_configWidget; IDeviceWidget *m_configWidget = nullptr;
QLabel *m_configurationLabel; QLabel *m_configurationLabel;
QComboBox *m_configurationComboBox; QComboBox *m_configurationComboBox;
@@ -97,7 +97,6 @@ private:
DeviceSettingsWidget::DeviceSettingsWidget() DeviceSettingsWidget::DeviceSettingsWidget()
: m_deviceManager(DeviceManager::cloneInstance()) : m_deviceManager(DeviceManager::cloneInstance())
, m_deviceManagerModel(new DeviceManagerModel(m_deviceManager, this)) , m_deviceManagerModel(new DeviceManagerModel(m_deviceManager, this))
, m_configWidget(nullptr)
{ {
m_configurationLabel = new QLabel(Tr::tr("&Device:")); m_configurationLabel = new QLabel(Tr::tr("&Device:"));
m_configurationComboBox = new QComboBox; m_configurationComboBox = new QComboBox;
@@ -116,7 +115,7 @@ DeviceSettingsWidget::DeviceSettingsWidget()
connect(addButton, &OptionPushButton::clicked, this, &DeviceSettingsWidget::addDevice); connect(addButton, &OptionPushButton::clicked, this, &DeviceSettingsWidget::addDevice);
QMenu *deviceTypeMenu = new QMenu(addButton); QMenu *deviceTypeMenu = new QMenu(addButton);
QAction *defaultAction = new QAction(Tr::tr("&Start Wizard to Add Device...")); QAction *defaultAction = new QAction(Tr::tr("&Start Wizard to Add Device..."), this);
connect(defaultAction, &QAction::triggered, this, &DeviceSettingsWidget::addDevice); connect(defaultAction, &QAction::triggered, this, &DeviceSettingsWidget::addDevice);
deviceTypeMenu->addAction(defaultAction); deviceTypeMenu->addAction(defaultAction);
deviceTypeMenu->addSeparator(); deviceTypeMenu->addSeparator();
@@ -128,7 +127,7 @@ DeviceSettingsWidget::DeviceSettingsWidget()
continue; continue;
//: Add <Device Type Name> //: Add <Device Type Name>
QAction *action = new QAction(Tr::tr("Add %1").arg(factory->displayName())); QAction *action = new QAction(Tr::tr("Add %1").arg(factory->displayName()), this);
deviceTypeMenu->addAction(action); deviceTypeMenu->addAction(action);
connect(action, &QAction::triggered, this, [factory, this] { connect(action, &QAction::triggered, this, [factory, this] {