From 74b6e90b15722744013e26f96aba674e493fb185 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 29 Jul 2020 09:06:24 +0200
Subject: [PATCH] ProjectExplorer: Add LayoutBuilder::addRow() convenience
 function

... and use it in the DebuggerRunConfigurationAspect.

Change-Id: I1079f1a307d5e4b286d32570c48299d296fa3061
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/debugger/debuggerrunconfigurationaspect.cpp | 8 ++++----
 src/plugins/projectexplorer/projectconfiguration.cpp    | 7 +++++++
 src/plugins/projectexplorer/projectconfiguration.h      | 1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
index 076fd9723de..fc27b57528f 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
@@ -169,13 +169,13 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(Target *target)
     setConfigWidgetCreator([this] {
         QWidget *w = new QWidget;
         LayoutBuilder builder(w);
-        m_cppAspect->addToLayout(builder);
-        m_qmlAspect->addToLayout(builder.startNewRow());
-        m_overrideStartupAspect->addToLayout(builder.startNewRow());
+        builder.addRow(m_cppAspect);
+        builder.addRow(m_qmlAspect);
+        builder.addRow(m_overrideStartupAspect);
 
         static const QByteArray env = qgetenv("QTC_DEBUGGER_MULTIPROCESS");
         if (env.toInt())
-            m_multiProcessAspect->addToLayout(builder.startNewRow());
+            builder.addRow(m_multiProcessAspect);
 
         return w;
     });
diff --git a/src/plugins/projectexplorer/projectconfiguration.cpp b/src/plugins/projectexplorer/projectconfiguration.cpp
index e52b02957b1..e28225b2a38 100644
--- a/src/plugins/projectexplorer/projectconfiguration.cpp
+++ b/src/plugins/projectexplorer/projectconfiguration.cpp
@@ -79,6 +79,13 @@ LayoutBuilder &LayoutBuilder::startNewRow()
     return *this;
 }
 
+LayoutBuilder &LayoutBuilder::addRow(const LayoutItem &item)
+{
+    startNewRow();
+    addItem(item);
+    return *this;
+}
+
 void LayoutBuilder::flushPendingItems()
 {
     if (m_pendingItems.isEmpty())
diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h
index 423b70ca8cc..c8c45b41436 100644
--- a/src/plugins/projectexplorer/projectconfiguration.h
+++ b/src/plugins/projectexplorer/projectconfiguration.h
@@ -71,6 +71,7 @@ public:
     LayoutBuilder &addItem(LayoutItem item);
 
     LayoutBuilder &startNewRow();
+    LayoutBuilder &addRow(const LayoutItem &item);
 
     QLayout *layout() const;