diff options
| author | hjk <hjk@qt.io> | 2020-09-28 14:27:56 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-09-28 15:11:49 +0000 |
| commit | bc4e76f76bfe4466c74c56abb7b38490d19f0a86 (patch) | |
| tree | 284dd746b3ad4160c94b4f025b246490c0a78ac3 /src/libs | |
| parent | a5026d7a2fc15494cbcf660a2dcd27a8b52a6af6 (diff) | |
Revert "Utils: Remove the text option for LayoutItem"
This reverts commit 5154e1eb023ca73fe4ac24025bc6bcadd931c9f1.
For some yet unknown reason, this renders the whole sublayout read-only.
Change-Id: Ide1587382392a57643bed1b3cdd7d8987dbdab57
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/utils/layoutbuilder.cpp | 15 | ||||
| -rw-r--r-- | src/libs/utils/layoutbuilder.h | 1 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/libs/utils/layoutbuilder.cpp b/src/libs/utils/layoutbuilder.cpp index 34f00bec5b..bc4e4c59f7 100644 --- a/src/libs/utils/layoutbuilder.cpp +++ b/src/libs/utils/layoutbuilder.cpp @@ -31,7 +31,6 @@ #include <QFormLayout> #include <QGridLayout> -#include <QLabel> #include <QWidget> namespace Utils { @@ -97,12 +96,7 @@ LayoutBuilder::LayoutItem::LayoutItem(BaseAspect *aspect) /*! Constructs a layout item containing some static \a text. */ -LayoutBuilder::LayoutItem::LayoutItem(const QString &text) -{ - auto label = new QLabel(text); - label->setTextInteractionFlags(Qt::TextBrowserInteraction); - widget = label; -} +LayoutBuilder::LayoutItem::LayoutItem(const QString &text) : text(text) {} /*! \class Utils::LayoutBuilder @@ -240,8 +234,11 @@ void LayoutBuilder::flushPendingFormItems() m_formLayout->addRow(label, layout); else if (auto widget = m_pendingFormItems.at(1).widget) m_formLayout->addRow(label, widget); - } else { - QTC_CHECK(false); + } else { + if (auto layout = m_pendingFormItems.at(1).layout) + m_formLayout->addRow(m_pendingFormItems.at(0).text, layout); + else if (auto widget = m_pendingFormItems.at(1).widget) + m_formLayout->addRow(m_pendingFormItems.at(0).text, widget); } } else { QTC_CHECK(false); diff --git a/src/libs/utils/layoutbuilder.h b/src/libs/utils/layoutbuilder.h index 567f6d373f..ddf6018518 100644 --- a/src/libs/utils/layoutbuilder.h +++ b/src/libs/utils/layoutbuilder.h @@ -62,6 +62,7 @@ public: QLayout *layout = nullptr; QWidget *widget = nullptr; BaseAspect *aspect = nullptr; + QString text; int span = 1; Qt::Alignment align; }; |