forked from qt-creator/qt-creator
Utils/ProjectExplorer: Move re-usabled bits of aspects to Utils
Classes involved are BaseAspect and some derived classes, LayoutBuilder and VariableChooser. This is mostly mechanical, with various include/using changes to make it compile. Change-Id: I624a457f3555f102e541c4c71e33a9423af32250 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -33,7 +33,6 @@
|
||||
#include <coreplugin/editormanager/documentmodel.h>
|
||||
#include <coreplugin/icore.h>
|
||||
#include <coreplugin/idocument.h>
|
||||
#include <coreplugin/variablechooser.h>
|
||||
|
||||
#include <projectexplorer/project.h>
|
||||
#include <projectexplorer/session.h>
|
||||
@@ -45,6 +44,7 @@
|
||||
#include <utils/mimetypes/mimedatabase.h>
|
||||
#include <utils/jsontreeitem.h>
|
||||
#include <utils/stringutils.h>
|
||||
#include <utils/variablechooser.h>
|
||||
|
||||
#include <QBoxLayout>
|
||||
#include <QComboBox>
|
||||
@@ -728,7 +728,7 @@ BaseSettingsWidget::BaseSettingsWidget(const BaseSettings *settings, QWidget *pa
|
||||
|
||||
mainLayout->addWidget(new QLabel(tr("Name:")), row, 0);
|
||||
mainLayout->addWidget(m_name, row, 1);
|
||||
auto chooser = new Core::VariableChooser(this);
|
||||
auto chooser = new Utils::VariableChooser(this);
|
||||
chooser->addSupportedWidget(m_name);
|
||||
|
||||
mainLayout->addWidget(new QLabel(tr("Language:")), ++row, 0);
|
||||
@@ -935,7 +935,7 @@ StdIOSettingsWidget::StdIOSettingsWidget(const StdIOSettings *settings, QWidget
|
||||
m_executable->setPath(QDir::toNativeSeparators(settings->m_executable));
|
||||
mainLayout->addWidget(m_arguments, baseRows + 1, 1);
|
||||
|
||||
auto chooser = new Core::VariableChooser(this);
|
||||
auto chooser = new Utils::VariableChooser(this);
|
||||
chooser->addSupportedWidget(m_arguments);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user