From f6cd2493be0cb286086ce9c4fbb797cb78d9e82e Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 23 Feb 2010 14:33:41 +0100
Subject: [PATCH] Set parents on objects
... otherwise we might leak memory
---
.../qt4projectmanager/qt4runconfiguration.cpp | 24 +++++++++++--------
.../qt4projectmanager/qt4runconfiguration.h | 2 ++
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index fe7e10a551c..06c4f4de570 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -195,25 +195,25 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
toplayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
toplayout->setMargin(0);
- QLabel *nameLabel = new QLabel(tr("Name:"));
- m_nameLineEdit = new QLineEdit(m_qt4RunConfiguration->displayName());
+ QLabel *nameLabel = new QLabel(tr("Name:"), this);
+ m_nameLineEdit = new QLineEdit(m_qt4RunConfiguration->displayName(), this);
nameLabel->setBuddy(m_nameLineEdit);
toplayout->addRow(nameLabel, m_nameLineEdit);
- m_executableLabel = new QLabel(m_qt4RunConfiguration->executable());
+ m_executableLabel = new QLabel(m_qt4RunConfiguration->executable(), this);
toplayout->addRow(tr("Executable:"), m_executableLabel);
- QLabel *argumentsLabel = new QLabel(tr("Arguments:"));
- m_argumentsLineEdit = new QLineEdit(ProjectExplorer::Environment::joinArgumentList(qt4RunConfiguration->commandLineArguments()));
+ QLabel *argumentsLabel = new QLabel(tr("Arguments:"), this);
+ m_argumentsLineEdit = new QLineEdit(ProjectExplorer::Environment::joinArgumentList(qt4RunConfiguration->commandLineArguments()), this);
argumentsLabel->setBuddy(m_argumentsLineEdit);
toplayout->addRow(argumentsLabel, m_argumentsLineEdit);
- m_workingDirectoryEdit = new Utils::PathChooser();
+ m_workingDirectoryEdit = new Utils::PathChooser(this);
m_workingDirectoryEdit->setPath(m_qt4RunConfiguration->workingDirectory());
m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::Directory);
m_workingDirectoryEdit->setPromptDialogTitle(tr("Select the working directory"));
- QToolButton *resetButton = new QToolButton();
+ QToolButton *resetButton = new QToolButton(this);
resetButton->setToolTip(tr("Reset to default"));
resetButton->setIcon(QIcon(":/core/images/reset.png"));
@@ -223,12 +223,12 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
boxlayout->addWidget(resetButton);
toplayout->addRow(tr("Working Directory:"), boxlayout);
- m_useTerminalCheck = new QCheckBox(tr("Run in Terminal"));
+ m_useTerminalCheck = new QCheckBox(tr("Run in Terminal"), this);
m_useTerminalCheck->setChecked(m_qt4RunConfiguration->runMode() == ProjectExplorer::LocalApplicationRunConfiguration::Console);
toplayout->addRow(QString(), m_useTerminalCheck);
#ifdef Q_OS_MAC
- m_usingDyldImageSuffix = new QCheckBox(tr("Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)"));
+ m_usingDyldImageSuffix = new QCheckBox(tr("Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)"), this);
m_usingDyldImageSuffix->setChecked(m_qt4RunConfiguration->isUsingDyldImageSuffix());
toplayout->addRow(QString(), m_usingDyldImageSuffix);
connect(m_usingDyldImageSuffix, SIGNAL(toggled(bool)),
@@ -243,7 +243,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
environmentLabel->setFont(f);
vboxTopLayout->addWidget(environmentLabel);
- QWidget *baseEnvironmentWidget = new QWidget;
+ QWidget *baseEnvironmentWidget = new QWidget(this);
QHBoxLayout *baseEnvironmentLayout = new QHBoxLayout(baseEnvironmentWidget);
baseEnvironmentLayout->setMargin(0);
QLabel *label = new QLabel(tr("Base environment for this runconfiguration:"), this);
@@ -303,6 +303,10 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
this, SLOT(baseEnvironmentChanged()));
}
+Qt4RunConfigurationWidget::~Qt4RunConfigurationWidget()
+{
+}
+
void Qt4RunConfigurationWidget::baseEnvironmentSelected(int index)
{
m_ignoreChange = true;
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt4runconfiguration.h
index 2d12ddc1a51..426986237aa 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.h
@@ -158,6 +158,8 @@ class Qt4RunConfigurationWidget : public QWidget
public:
Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4runconfigration, QWidget *parent);
+ ~Qt4RunConfigurationWidget();
+
protected:
void showEvent(QShowEvent *event);
void hideEvent(QHideEvent *event);
--
GitLab