From 35d0e9dea854ce1e40b23a9ff9dcaf1be8893365 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 13 Oct 2022 08:53:37 +0200 Subject: [PATCH] CMake: Make configure environment optically part of configure step Change-Id: I1b246acb2a057e624f7808d385a2d33c716d535d Reviewed-by: Alessandro Portale --- .../cmakebuildconfiguration.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 7dd6dc2f973..79bb9925cc6 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -175,14 +175,10 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) : BuildConfiguration *bc = bs->buildConfiguration(); CMakeBuildConfiguration *cbc = static_cast(bc); - auto vbox = new QVBoxLayout(this); - vbox->setContentsMargins(0, 0, 0, 0); m_configureDetailsWidget = new DetailsWidget; updateConfigureDetailsWidgetsSummary(); - vbox->addWidget(m_configureDetailsWidget); - auto details = new QWidget(m_configureDetailsWidget); m_configureDetailsWidget->setWidget(details); @@ -333,9 +329,6 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) : envWidget->setBaseEnvironmentText(cbc->baseConfigureEnvironmentText()); }); - vbox->addWidget(clearBox); - vbox->addWidget(envWidget); - using namespace Layouting; Grid cmakeConfiguration { m_filterEdit, br, @@ -372,10 +365,16 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) : }, m_reconfigureButton, } - } + }, + clearBox, + envWidget }.setSpacing(0) }.attachTo(details, WithoutMargins); + Column { + m_configureDetailsWidget, + }.attachTo(this, WithoutMargins); + updateAdvancedCheckBox(); setError(m_buildSystem->error()); setWarning(m_buildSystem->warning());