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

ProjectExplorer: Un-export BuildEnvironmentWidget

Browse Source 
Apparently not needed anymore outside.

Change-Id: I9f4f1a65f56a86ba75a37a9b96db71472b3e0af2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-02-19 18:38:10 +01:00
parent 7f1c8aea5d
commit 6033c31e23
7 changed files with 47 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/plugins/projectexplorer/buildconfiguration.cpp
View File

@@ -26,22 +26,22 @@
#include "buildconfiguration.h"
#include "buildaspects.h"
#include "buildenvironmentwidget.h"
#include "buildinfo.h"
#include "buildsteplist.h"
#include "buildstepspage.h"
#include "buildsystem.h"
#include "namedwidget.h"
#include "environmentwidget.h"
#include "kit.h"
#include "kitinformation.h"
#include "kitmanager.h"
#include "project.h"
#include "projectexplorer.h"
#include "namedwidget.h"
#include "projectexplorerconstants.h"
#include "projectexplorer.h"
#include "project.h"
#include "projectmacroexpander.h"
#include "projecttree.h"
#include "target.h"
#include "session.h"
#include "target.h"
#include "toolchain.h"
#include <coreplugin/idocument.h>
@@ -54,8 +54,10 @@
#include <utils/mimetypes/mimetype.h>
#include <utils/qtcassert.h>
#include <QCheckBox>
#include <QDebug>
#include <QFormLayout>
#include <QVBoxLayout>
using namespace Utils;
@@ -67,6 +69,45 @@ const char USER_ENVIRONMENT_CHANGES_KEY[] = "ProjectExplorer.BuildConfiguration.
namespace ProjectExplorer {
namespace Internal {
class BuildEnvironmentWidget : public NamedWidget
{
Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::BuildEnvironmentWidget)
public:
explicit BuildEnvironmentWidget(BuildConfiguration *bc)
: NamedWidget(tr("Build Environment"))
{
auto clearBox = new QCheckBox(tr("Clear system environment"), this);
clearBox->setChecked(!bc->useSystemEnvironment());
auto envWidget = new EnvironmentWidget(this, EnvironmentWidget::TypeLocal, clearBox);
envWidget->setBaseEnvironment(bc->baseEnvironment());
envWidget->setBaseEnvironmentText(bc->baseEnvironmentText());
envWidget->setUserChanges(bc->userEnvironmentChanges());
connect(envWidget, &EnvironmentWidget::userChangesChanged, this, [bc, envWidget] {
bc->setUserEnvironmentChanges(envWidget->userChanges());
});
connect(clearBox, &QAbstractButton::toggled, this, [bc, envWidget](bool checked) {
bc->setUseSystemEnvironment(!checked);
envWidget->setBaseEnvironment(bc->baseEnvironment());
envWidget->setBaseEnvironmentText(bc->baseEnvironmentText());
});
connect(bc, &BuildConfiguration::environmentChanged, this, [bc, envWidget] {
envWidget->setBaseEnvironment(bc->baseEnvironment());
envWidget->setBaseEnvironmentText(bc->baseEnvironmentText());
});
auto vbox = new QVBoxLayout(this);
vbox->setContentsMargins(0, 0, 0, 0);
vbox->addWidget(clearBox);
vbox->addWidget(envWidget);
}
};
class BuildConfigurationPrivate
{
public:
@@ -245,7 +286,7 @@ NamedWidget *BuildConfiguration::createConfigWidget()
QList<NamedWidget *> BuildConfiguration::createSubConfigWidgets()
{
return {new BuildEnvironmentWidget(this)};
return {new Internal::BuildEnvironmentWidget(this)};
}
BuildSystem *BuildConfiguration::buildSystem() const