aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/targetsettingspanel.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2016-09-30 12:59:54 +0200
committerhjk <hjk@qt.io>2016-10-04 12:54:02 +0000
commit0906c62b709da37b1501c97febed00c00a9ae47a (patch)
tree5072254901ba1117d4aee3ac278d21550ae59be9 /src/plugins/projectexplorer/targetsettingspanel.cpp
parent6913f90384592ceba3ec376856f802fe99a1de56 (diff)
ProjectExplorer: Remove PropertiesPanel struct
Parameter structs are convenient if they get passed around a lot or are regularly changed. This isn't the case here, so make the user code more compact instead. Change-Id: Idd5e5cc1f70b1547607532cd3e6515c27983c169 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/targetsettingspanel.cpp')
-rw-r--r--src/plugins/projectexplorer/targetsettingspanel.cpp23
1 files changed, 7 insertions, 16 deletions
diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp
index eec9f3fdd0..a7e827ed52 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.cpp
+++ b/src/plugins/projectexplorer/targetsettingspanel.cpp
@@ -39,7 +39,6 @@
#include "projectimporter.h"
#include "projecttree.h"
#include "projectwindow.h"
-#include "propertiespanel.h"
#include "runsettingspropertiespage.h"
#include "session.h"
#include "target.h"
@@ -257,29 +256,25 @@ void TargetGroupItemPrivate::ensureWidget()
if (!m_configurePage) {
auto panelsWidget = new PanelsWidget;
- auto panel = new PropertiesPanel;
- panel->setDisplayName(tr("Configure Project"));
auto widget = new TargetSetupPageWrapper(m_project);
- panel->setWidget(widget);
- panel->setIcon(QIcon(":/projectexplorer/images/unconfigured.png"));
- panelsWidget->addPropertiesPanel(panel);
+ panelsWidget->addPropertiesPanel(tr("Configure Project"),
+ QIcon(":/projectexplorer/images/unconfigured.png"),
+ widget);
panelsWidget->setFocusProxy(widget);
m_configurePage = panelsWidget;
}
if (!m_configuredPage) {
auto panelsWidget = new PanelsWidget;
- auto panel = new PropertiesPanel;
- panel->setDisplayName(tr("Configure Project"));
auto widget = new QWidget;
auto label = new QLabel("This project is already configured.");
auto layout = new QVBoxLayout(widget);
layout->setMargin(0);
layout->addWidget(label);
layout->addStretch(10);
- panel->setWidget(widget);
- panel->setIcon(QIcon(":/projectexplorer/images/unconfigured.png"));
- panelsWidget->addPropertiesPanel(panel);
+ panelsWidget->addPropertiesPanel(tr("Configure Project"),
+ QIcon(":/projectexplorer/images/unconfigured.png"),
+ widget);
m_configuredPage = panelsWidget;
}
}
@@ -605,18 +600,14 @@ public:
static QWidget *createPanelWidget(QWidget *widget, const QString &displayName, const QString &icon)
{
- auto panel = new PropertiesPanel;
auto w = new QWidget();
auto l = new QVBoxLayout(w);
l->addWidget(widget);
l->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding));
l->setContentsMargins(QMargins());
- panel->setWidget(w);
- panel->setIcon(QIcon(icon));
- panel->setDisplayName(displayName);
auto result = new PanelsWidget;
- result->addPropertiesPanel(panel);
+ result->addPropertiesPanel(displayName, QIcon(icon), w);
return result;
}