From d26d9250b2096919bce5d352c6430815e745af36 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 6 Oct 2020 15:43:14 +0200 Subject: [PATCH] QmakeProjectManager: Use StringAspect for effective qmake call ... in QmakeStep. Change-Id: Idf8ef37f99e08cd3462af4e4dd2b1639f82694df Reviewed-by: Christian Kandeler --- src/plugins/qmakeprojectmanager/qmakestep.cpp | 20 +++++++++---------- src/plugins/qmakeprojectmanager/qmakestep.h | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 3406f0c7bd9..74147fe102c 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -91,6 +91,13 @@ QMakeStep::QMakeStep(BuildStepList *bsl, Utils::Id id) m_userArgs->setSettingsKey(QMAKE_ARGUMENTS_KEY); m_userArgs->setLabelText(tr("Additional arguments:")); + m_effectiveCall = addAspect(); + 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] { BaseQtVersion *qtVersion = QtKitAspect::qtVersion(target()->kit()); if (!qtVersion) @@ -506,14 +513,6 @@ QWidget *QMakeStep::createConfigWidget() { 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->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop); @@ -522,7 +521,7 @@ QWidget *QMakeStep::createConfigWidget() LayoutBuilder builder(widget); builder.addRow(m_buildType); builder.addRow(m_userArgs); - builder.addRow({label, qmakeArgumentsEdit}); + builder.addRow(m_effectiveCall); builder.addRow({abisLabel, abisListWidget}); qmakeBuildConfigChanged(); @@ -725,8 +724,7 @@ void QMakeStep::updateAbiWidgets() void QMakeStep::updateEffectiveQMakeCall() { - if (qmakeArgumentsEdit) - qmakeArgumentsEdit->setPlainText(effectiveQMakeCall()); + m_effectiveCall->setValue(effectiveQMakeCall()); } void QMakeStep::recompileMessageBoxFinished(int button) diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h index 30082ed01b8..3679186297a 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.h +++ b/src/plugins/qmakeprojectmanager/qmakestep.h @@ -211,7 +211,7 @@ private: QLabel *abisLabel = nullptr; Utils::SelectionAspect *m_buildType = nullptr; - QPlainTextEdit *qmakeArgumentsEdit = nullptr; + Utils::StringAspect *m_effectiveCall = nullptr; QListWidget *abisListWidget = nullptr; };