From c3efe23ad1e93a1a9fc1be5100134af841ffd6d3 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Mon, 15 May 2023 10:40:56 +0200
Subject: [PATCH] Examples: Revamp sql/books

* use nullptr
* use member init
* set ExpandingFieldsGrow fieldGrowthPolicy for QFormLayout, which
makes it behaviors similar on macOS as other platforms
* select first row to make up/down keys works by default

Change-Id: I25d9869d2ca1c7274c2b750aada8270734787546
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit ed1fbc7a88008ddf118556a97f1ee34989151c75)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 examples/sql/books/bookwindow.cpp | 1 +
 examples/sql/books/bookwindow.h   | 4 ++--
 examples/sql/books/bookwindow.ui  | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/examples/sql/books/bookwindow.cpp b/examples/sql/books/bookwindow.cpp
index 2ec5459e1b3..b7baad48cc0 100644
--- a/examples/sql/books/bookwindow.cpp
+++ b/examples/sql/books/bookwindow.cpp
@@ -89,6 +89,7 @@ BookWindow::BookWindow()
             );
 
     ui.bookTable->setCurrentIndex(model->index(0, 0));
+    ui.bookTable->selectRow(0);
     createMenuBar();
 }
 
diff --git a/examples/sql/books/bookwindow.h b/examples/sql/books/bookwindow.h
index ba569292a60..8030516e5b6 100644
--- a/examples/sql/books/bookwindow.h
+++ b/examples/sql/books/bookwindow.h
@@ -22,8 +22,8 @@ private slots:
 private:
     void showError(const QSqlError &err);
     Ui::BookWindow ui;
-    QSqlRelationalTableModel *model;
-    int authorIdx, genreIdx;
+    QSqlRelationalTableModel *model = nullptr;
+    int authorIdx = 0, genreIdx = 0;
 
     void createMenuBar();
 };
diff --git a/examples/sql/books/bookwindow.ui b/examples/sql/books/bookwindow.ui
index ce8f9f933af..c93726c5532 100644
--- a/examples/sql/books/bookwindow.ui
+++ b/examples/sql/books/bookwindow.ui
@@ -64,6 +64,9 @@
           <string>Details</string>
          </property>
          <layout class="QFormLayout">
+          <property name="fieldGrowthPolicy">
+           <enum>QFormLayout::ExpandingFieldsGrow</enum>
+          </property>
           <item row="0" column="0">
            <widget class="QLabel" name="label_5">
             <property name="text">