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

SystemSettingsWidget: Don't leak label and combobox on non mac host

Browse Source 
Change-Id: I9968a38055a8c1224aa09aad34ef5b3a30bd3490
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2024-03-14 16:01:03 +01:00
parent 4fa5422026
commit 92fca24842
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/systemsettings.cpp
View File

@@ -161,7 +161,7 @@ class SystemSettingsWidget : public IOptionsPageWidget
{ {
public: public:
SystemSettingsWidget() SystemSettingsWidget()
: m_fileSystemCaseSensitivityChooser(new QComboBox) : m_fileSystemCaseSensitivityChooser(HostOsInfo::isMacHost() ? new QComboBox : nullptr)
, m_externalFileBrowserEdit(new QLineEdit) , m_externalFileBrowserEdit(new QLineEdit)
, m_terminalComboBox(new QComboBox) , m_terminalComboBox(new QComboBox)
, m_terminalOpenArgs(new QLineEdit) , m_terminalOpenArgs(new QLineEdit)
@@ -188,9 +188,6 @@ public:
m_terminalOpenArgs->setToolTip( m_terminalOpenArgs->setToolTip(
Tr::tr("Command line arguments used for \"%1\".").arg(FileUtils::msgTerminalHereAction())); Tr::tr("Command line arguments used for \"%1\".").arg(FileUtils::msgTerminalHereAction()));
auto fileSystemCaseSensitivityLabel = new QLabel(Tr::tr("File system case sensitivity:"));
fileSystemCaseSensitivityLabel->setToolTip(
Tr::tr("Influences how file names are matched to decide if they are the same."));
auto resetFileBrowserButton = new QPushButton(Tr::tr("Reset")); auto resetFileBrowserButton = new QPushButton(Tr::tr("Reset"));
resetFileBrowserButton->setToolTip(Tr::tr("Reset to default.")); resetFileBrowserButton->setToolTip(Tr::tr("Reset to default."));
auto helpExternalFileBrowserButton = new QToolButton; auto helpExternalFileBrowserButton = new QToolButton;
@@ -223,6 +220,9 @@ public:
} }
grid.addRow({Span(4, s.patchCommand)}); grid.addRow({Span(4, s.patchCommand)});
if (HostOsInfo::isMacHost()) { if (HostOsInfo::isMacHost()) {
auto fileSystemCaseSensitivityLabel = new QLabel(Tr::tr("File system case sensitivity:"));
fileSystemCaseSensitivityLabel->setToolTip(
Tr::tr("Influences how file names are matched to decide if they are the same."));
grid.addRow({fileSystemCaseSensitivityLabel, grid.addRow({fileSystemCaseSensitivityLabel,
m_fileSystemCaseSensitivityChooser}); m_fileSystemCaseSensitivityChooser});
} }