From edde7706761ade1c612de2d0a3cf4f7b766cc885 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Fri, 3 May 2024 16:55:45 +0200
Subject: [PATCH] Android: Use less Grid features in AndroidSdkManagerWidget

Grid is only needed for the empty space in the upper right. Remove usage
of Spans.

Change-Id: Ib612589f3d19ee659af63926a13adc1e9ddbde7d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 .../android/androidsdkmanagerwidget.cpp       | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/plugins/android/androidsdkmanagerwidget.cpp b/src/plugins/android/androidsdkmanagerwidget.cpp
index edf15f40afc..dffc39d8f94 100644
--- a/src/plugins/android/androidsdkmanagerwidget.cpp
+++ b/src/plugins/android/androidsdkmanagerwidget.cpp
@@ -89,26 +89,28 @@ AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidSdkManager *sdkManager,
     packagesView->header()->setStretchLastSection(false);
 
     using namespace Layouting;
-    Grid {
-        searchField, expandCheck, br,
-        Span(2, packagesView),
-        Column {
-            updateInstalledButton,
-            st,
-            Group {
-                title(Tr::tr("Show Packages")),
-                Column {
-                    Row { Tr::tr("Channel:"), channelCheckbox },
-                    obsoleteCheckBox,
-                    hr,
-                    showAvailableRadio,
-                    showInstalledRadio,
-                    showAllRadio,
-                }
-            },
-            optionsButton
-        }, br,
-        Span(3, m_buttonBox)
+    Column {
+        Grid {
+            Row {searchField, expandCheck}, br,
+            packagesView,
+            Column {
+                updateInstalledButton,
+                st,
+                Group {
+                    title(Tr::tr("Show Packages")),
+                    Column {
+                        Row { Tr::tr("Channel:"), channelCheckbox },
+                        obsoleteCheckBox,
+                        hr,
+                        showAvailableRadio,
+                        showInstalledRadio,
+                        showAllRadio,
+                    }
+                },
+                optionsButton,
+            }, br,
+        },
+        m_buttonBox,
     }.attachTo(this);
 
     connect(m_sdkModel, &AndroidSdkModel::dataChanged, this, [this] {