From bc4e76f76bfe4466c74c56abb7b38490d19f0a86 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 28 Sep 2020 14:27:56 +0200
Subject: 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>
---
 src/libs/utils/layoutbuilder.cpp | 15 ++++++---------
 src/libs/utils/layoutbuilder.h   |  1 +
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/libs')

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;
     };
-- 
cgit v1.2.3