aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/utils/layoutbuilder.cpp15
-rw-r--r--src/libs/utils/layoutbuilder.h1
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;
};