Utils: Avoid intermediate widgets when using LayoutBuilder

In most cases, the layout constructed in the builder was set
on a widget which in turn was put into a vbox in the actual
widget. This is not necessary, but needs some re-ordering.

Also make sure that using not-yet-parented widgets during
layout construction does not cause visible artifacts.

Change-Id: I75727a571da093d3131ea6fba467c2c646cdb6f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

2 files changed, 8 insertions, 10 deletions

diff --git a/src/plugins/valgrind/valgrindconfigwidget.cpp b/src/plugins/valgrind/valgrindconfigwidget.cpp
index 063bce26bb7..4826b1a6dd9 100644
--- a/src/plugins/valgrind/valgrindconfigwidget.cpp
+++ b/src/plugins/valgrind/valgrindconfigwidget.cpp
@@ -88,14 +88,14 @@ ValgrindConfigWidget::ValgrindConfigWidget(ValgrindBaseSettings *settings)
         s.minimumInclusiveCostRatio, nl,
         s.visualizationMinimumInclusiveCostRatio, nl,
         s.enableEventToolTips, nl,
-        Item {
+        Span {
+            2,
             Group {
                 s.enableCacheSim,
                 s.enableBranchSim,
                 s.collectSystime,
                 s.collectBusEvents,
-            },
-            2 // Span.
+            }
         }
     };
 
diff --git a/src/plugins/valgrind/valgrindsettings.cpp b/src/plugins/valgrind/valgrindsettings.cpp
index 81704cdba12..bb93f0b0c51 100644
--- a/src/plugins/valgrind/valgrindsettings.cpp
+++ b/src/plugins/valgrind/valgrindsettings.cpp
@@ -214,14 +214,12 @@ void SuppressionAspect::addToLayout(LayoutBuilder &builder)
     connect(d->entryList->selectionModel(), &QItemSelectionModel::selectionChanged,
             d, &SuppressionAspectPrivate::slotSuppressionSelectionChanged);
 
-    Group group {
-        Title(tr("Suppression files:")),
-        Row {
-            d->entryList.data(),
-            Column { d->addEntry.data(), d->removeEntry.data(), Stretch() }
-        }
+    builder.addItem(tr("Suppression files:"));
+    Row group {
+        d->entryList.data(),
+                Column { d->addEntry.data(), d->removeEntry.data(), Stretch() }
     };
-    builder.addItem(Item { group, 2 });
+    builder.addItem(Span { 2, group });
 }
 
 void SuppressionAspect::fromMap(const QVariantMap &map)