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

QbsProjectManager: Aspectify QbsBuildConfiguration

Browse Source 
Change-Id: Ifff6b770b9c6e2313809b35eef041c674df362e4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-04-26 18:25:28 +02:00
parent 02280bf14e
commit 8e1e312273
8 changed files with 41 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,7 @@
#include <coreplugin/idocument.h>
#include <utils/algorithm.h>
#include <utils/detailswidget.h>
#include <utils/macroexpander.h>
#include <utils/mimetypes/mimedatabase.h>
#include <utils/mimetypes/mimetype.h>
@@ -123,8 +124,23 @@ void BuildConfiguration::setBuildDirectory(const Utils::FileName &dir)
NamedWidget *BuildConfiguration::createConfigWidget()
{
auto widget = new NamedWidget;
widget->setDisplayName(m_configWidgetDisplayName);
NamedWidget *named = new NamedWidget;
named->setDisplayName(m_configWidgetDisplayName);
QWidget *widget = nullptr;
if (m_configWidgetHasFrame) {
auto container = new Utils::DetailsWidget(named);
widget = new QWidget(container);
container->setState(Utils::DetailsWidget::NoSummary);
container->setWidget(widget);
auto vbox = new QVBoxLayout(named);
vbox->setMargin(0);
vbox->addWidget(container);
} else {
widget = named;
}
auto formLayout = new QFormLayout(widget);
formLayout->setMargin(0);
@@ -135,7 +151,7 @@ NamedWidget *BuildConfiguration::createConfigWidget()
aspect->addToConfigurationLayout(formLayout);
}
return widget;
return named;
}
void BuildConfiguration::initialize(const BuildInfo &info)
@@ -242,6 +258,11 @@ void BuildConfiguration::setBuildDirectoryHistoryCompleter(const QString &histor
m_buildDirectoryAspect->setHistoryCompleter(history);
}
void BuildConfiguration::setConfigWidgetHasFrame(bool configWidgetHasFrame)
{
m_configWidgetHasFrame = configWidgetHasFrame;
}
Target *BuildConfiguration::target() const
{
return static_cast<Target *>(parent());