diff --git a/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp b/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp index 156d93be40e..0f4658acc8a 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp @@ -35,6 +35,9 @@ public: { refresh(); // set up everything according to kit m_lineEdit->setToolTip(ki->description()); + QSizePolicy p = m_lineEdit->sizePolicy(); + p.setHorizontalStretch(1); + m_lineEdit->setSizePolicy(p); connect(m_lineEdit, &QLineEdit::textEdited, this, &QmakeKitAspectImpl::mkspecWasChanged); } diff --git a/src/plugins/qtsupport/qtkitaspect.cpp b/src/plugins/qtsupport/qtkitaspect.cpp index bde243f7ef8..14cfe626324 100644 --- a/src/plugins/qtsupport/qtkitaspect.cpp +++ b/src/plugins/qtsupport/qtkitaspect.cpp @@ -19,6 +19,8 @@ #include #include +#include + #include #include #include @@ -26,6 +28,8 @@ #include #include +#include + using namespace ProjectExplorer; using namespace Utils; @@ -78,6 +82,23 @@ public: refresh(); }); } + +private: + void addToInnerLayout(Layouting::Layout &parentItem) override + { + if (const QList embedded = aspectsToEmbed(); !embedded.isEmpty()) { + Layouting::Layout layout(new QHBoxLayout); + KitAspect::addToInnerLayout(layout); + QSizePolicy p = comboBoxes().first()->sizePolicy(); + p.setHorizontalStretch(2); + comboBoxes().first()->setSizePolicy(p); + layout.addItem(Tr::tr("Mkspec:")); + embedded.first()->addToInnerLayout(layout); + parentItem.addItem(layout); + } else { + KitAspect::addToInnerLayout(parentItem); + } + } }; } // namespace Internal @@ -123,6 +144,7 @@ QtKitAspectFactory::QtKitAspectFactory() "A Qt version is required for qmake-based projects " "and optional when using other build systems.")); setPriority(26000); + setEmbeddableAspects({QmakeProjectManager::Constants::KIT_INFORMATION_ID}); } void QtKitAspectFactory::setup(Kit *k)