From 998b21c25d73277dd8e99edfe547041f57d56582 Mon Sep 17 00:00:00 2001
From: Andreas Eliasson <andreas.eliasson@qt.io>
Date: Wed, 23 Mar 2022 06:23:11 +0100
Subject: Doc: Revise Qt SQL module landing page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Include new CMake and qmake snippets and reorganize some of the sections
structure.

Task-number: QTBUG-100369
Pick-to: 6.3
Change-Id: I47cc9b24818c26740e49e6365bf881874942b79c
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
 src/sql/doc/src/qtsql.qdoc | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

(limited to 'src/sql/doc/src/qtsql.qdoc')

diff --git a/src/sql/doc/src/qtsql.qdoc b/src/sql/doc/src/qtsql.qdoc
index 9d9eb369da..d405b5af9a 100644
--- a/src/sql/doc/src/qtsql.qdoc
+++ b/src/sql/doc/src/qtsql.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -41,13 +41,35 @@
     The \l{SQL Programming} guide contains information about development using
     Qt SQL.
 
-    \include module-use.qdocinc using qt module
-    \snippet snippets/CMakeLists.txt cmake_use
+    \section1 Using the Module
 
-    See also the \l {Build with CMake} overview.
+    \include {module-use.qdocinc} {using the c++ api}
 
-    \include module-use.qdocinc building with qmake
-    \snippet snippets/code/code.pro qmake_use
+    \section2 Building with CMake
+
+    \include {module-use.qdocinc} {building with cmake} {Sql}
+
+    \section2 Building with qmake
+
+    \include {module-use.qdocinc} {building_with_qmake} {sql}
+
+    \section1 Articles and Guides
+
+    \list
+        \li \l {SQL Programming} {Qt SQL Programming Guide}
+    \endlist
+
+    \section1 Examples
+
+    \list
+        \li \l {SQL Examples}
+    \endlist
+
+    \section1 Reference
+
+    \list
+        \li \l {Qt SQL C++ Classes} {C++ Classes}
+    \endlist
 
     \section1 Module Evolution
     \l{Changes to Qt SQL} lists important changes in the module API
@@ -65,14 +87,6 @@
     modules under following permissive licenses:
 
     \generatelist{groupsbymodule attributions-qtsql}
-
-    \section1 Related Information
-
-    These are links to the API reference materials and related pages.
-    \list
-    \li \l{Qt SQL C++ Classes}{C++ Classes}
-    \li \l{SQL Examples}
-    \endlist
 */
 
 /*!
-- 
cgit v1.2.3