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

QmakeProjectManager: Use StringAspect for effective qmake call

Browse Source 
... in QmakeStep.

Change-Id: Idf8ef37f99e08cd3462af4e4dd2b1639f82694df
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-10-06 15:43:14 +02:00
parent 3ab54e91b1
commit d26d9250b2
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -91,6 +91,13 @@ QMakeStep::QMakeStep(BuildStepList *bsl, Utils::Id id)
m_userArgs->setSettingsKey(QMAKE_ARGUMENTS_KEY); m_userArgs->setSettingsKey(QMAKE_ARGUMENTS_KEY);
m_userArgs->setLabelText(tr("Additional arguments:")); m_userArgs->setLabelText(tr("Additional arguments:"));
m_effectiveCall = addAspect<StringAspect>();
m_effectiveCall->setDisplayStyle(StringAspect::TextEditDisplay);
m_effectiveCall->setLabelText(tr("Effective qmake call:"));
m_effectiveCall->setReadOnly(true);
m_effectiveCall->setUndoRedoEnabled(false);
m_effectiveCall->setEnabled(true);
auto updateSummary = [this] { auto updateSummary = [this] {
BaseQtVersion *qtVersion = QtKitAspect::qtVersion(target()->kit()); BaseQtVersion *qtVersion = QtKitAspect::qtVersion(target()->kit());
if (!qtVersion) if (!qtVersion)
@@ -506,14 +513,6 @@ QWidget *QMakeStep::createConfigWidget()
{ {
auto widget = new QWidget; auto widget = new QWidget;
auto label = new QLabel(tr("Effective qmake call:"), widget);
label->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
qmakeArgumentsEdit = new QPlainTextEdit(widget);
qmakeArgumentsEdit->setEnabled(true);
qmakeArgumentsEdit->setMaximumSize(QSize(16777215, 120));
qmakeArgumentsEdit->setTextInteractionFlags(Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse);
abisLabel = new QLabel(tr("ABIs:"), widget); abisLabel = new QLabel(tr("ABIs:"), widget);
abisLabel->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop); abisLabel->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
@@ -522,7 +521,7 @@ QWidget *QMakeStep::createConfigWidget()
LayoutBuilder builder(widget); LayoutBuilder builder(widget);
builder.addRow(m_buildType); builder.addRow(m_buildType);
builder.addRow(m_userArgs); builder.addRow(m_userArgs);
builder.addRow({label, qmakeArgumentsEdit}); builder.addRow(m_effectiveCall);
builder.addRow({abisLabel, abisListWidget}); builder.addRow({abisLabel, abisListWidget});
qmakeBuildConfigChanged(); qmakeBuildConfigChanged();
@@ -725,8 +724,7 @@ void QMakeStep::updateAbiWidgets()
void QMakeStep::updateEffectiveQMakeCall() void QMakeStep::updateEffectiveQMakeCall()
{ {
if (qmakeArgumentsEdit) m_effectiveCall->setValue(effectiveQMakeCall());
qmakeArgumentsEdit->setPlainText(effectiveQMakeCall());
} }
void QMakeStep::recompileMessageBoxFinished(int button) void QMakeStep::recompileMessageBoxFinished(int button)

2
src/plugins/qmakeprojectmanager/qmakestep.h
View File

@@ -211,7 +211,7 @@ private:
QLabel *abisLabel = nullptr; QLabel *abisLabel = nullptr;
Utils::SelectionAspect *m_buildType = nullptr; Utils::SelectionAspect *m_buildType = nullptr;
QPlainTextEdit *qmakeArgumentsEdit = nullptr; Utils::StringAspect *m_effectiveCall = nullptr;
QListWidget *abisListWidget = nullptr; QListWidget *abisListWidget = nullptr;
}; };