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

CMake: Make configure environment optically part of configure step

Browse Source 
Change-Id: I1b246acb2a057e624f7808d385a2d33c716d535d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2022-10-13 08:53:37 +02:00
parent 6c858c5cd6
commit 35d0e9dea8
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -175,14 +175,10 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
BuildConfiguration *bc = bs->buildConfiguration(); BuildConfiguration *bc = bs->buildConfiguration();
CMakeBuildConfiguration *cbc = static_cast<CMakeBuildConfiguration *>(bc); CMakeBuildConfiguration *cbc = static_cast<CMakeBuildConfiguration *>(bc);
auto vbox = new QVBoxLayout(this);
vbox->setContentsMargins(0, 0, 0, 0);
m_configureDetailsWidget = new DetailsWidget; m_configureDetailsWidget = new DetailsWidget;
updateConfigureDetailsWidgetsSummary(); updateConfigureDetailsWidgetsSummary();
vbox->addWidget(m_configureDetailsWidget);
auto details = new QWidget(m_configureDetailsWidget); auto details = new QWidget(m_configureDetailsWidget);
m_configureDetailsWidget->setWidget(details); m_configureDetailsWidget->setWidget(details);
@@ -333,9 +329,6 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
envWidget->setBaseEnvironmentText(cbc->baseConfigureEnvironmentText()); envWidget->setBaseEnvironmentText(cbc->baseConfigureEnvironmentText());
}); });
vbox->addWidget(clearBox);
vbox->addWidget(envWidget);
using namespace Layouting; using namespace Layouting;
Grid cmakeConfiguration { Grid cmakeConfiguration {
m_filterEdit, br, m_filterEdit, br,
@@ -372,10 +365,16 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
}, },
m_reconfigureButton, m_reconfigureButton,
} }
} },
clearBox,
envWidget
}.setSpacing(0) }.setSpacing(0)
}.attachTo(details, WithoutMargins); }.attachTo(details, WithoutMargins);
Column {
m_configureDetailsWidget,
}.attachTo(this, WithoutMargins);
updateAdvancedCheckBox(); updateAdvancedCheckBox();
setError(m_buildSystem->error()); setError(m_buildSystem->error());
setWarning(m_buildSystem->warning()); setWarning(m_buildSystem->warning());