1 files changed, 148 insertions, 139 deletions
diff --git a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc
index 1d14adcb38..896839a1d9 100644
--- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc
+++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc
@@ -1,52 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 //! [0]
 [...]
@@ -56,7 +9,7 @@ Database options:
   -sql-<driver> ........ Enable SQL <driver> plugin. Supported drivers:
                          db2 ibase mysql oci odbc psql sqlite
                          [all auto]
-  -sqlite .............. Select used sqlite3 [system/qt]
+  -sqlite .............. Select used sqlite [system/qt]
 
 [...]
 //! [0]
@@ -70,146 +23,173 @@ BEGIN
 END
 //! [1]
 
+
 //! [3]
-cd $QTDIR/qtbase/src/plugins/sqldrivers
-qmake -- MYSQL_PREFIX=/usr/local
-make sub-mysql
+mkdir build-sqldrivers
+cd build-sqldrivers
+qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DMySQL_INCLUDE_DIR="/usr/local/mysql/include" -DMySQL_LIBRARY="/usr/local/mysql/lib/libmysqlclient.<so|dylib>"
+cmake --build .
+cmake --install .
 //! [3]
 
 
-//! [4]
-cd $QTDIR/qtbase/src/plugins/sqldrivers/mysql
-make install
-//! [4]
-
-
 //! [5]
-cd %QTDIR%\qtbase\src\plugins\sqldrivers
-qmake -- MYSQL_INCDIR="C:/Program Files/MySQL/MySQL Connector C 6.1/include" MYSQL_LIBDIR="C:/Program Files/MySQL/MySQL Connector C 6.1/lib"
-nmake sub-mysql
-nmake install
+mkdir build-sqldrivers
+cd build-sqldrivers
+qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DMySQL_INCLUDE_DIR="C:\mysql-8.0.22-winx64\include" -DMySQL_LIBRARY="C:\mysql-8.0.22-winx64\lib\libmysql.lib"
+cmake --build .
+cmake --install .
 //! [5]
 
 
 //! [7]
-cd $QTDIR/qtbase/src/plugins/sqldrivers
-qmake -- OCI_INCDIR=/usr/include/oracle/11.2/client OCI_LIBDIR=/usr/lib/oracle/11.2/client/lib
-make sub-oci
+mkdir build-sqldrivers
+cd build-sqldrivers
+qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DOracle_INCLUDE_DIR="/usr/include/oracle/21/client64" -DOracle_LIBRARY="/usr/lib/oracle/21/client64/lib/libclntsh.<so|dylib>"
+cmake --build .
+cmake --install .
 //! [7]
 
 
 //! [8]
-cd %QTDIR%\qtbase\src\plugins\sqldrivers
-qmake -- OCI_INCDIR=c:/oracle/oci/include OCI_LIBDIR=c:/oracle/oci/lib/msvc
-nmake sub-oci
+mkdir build-sqldrivers
+cd build-sqldrivers
+qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DOracle_INCLUDE_DIR="C:\oracle\sdk\include" -DOracle_LIBRARY="C:\oracle\oci.lib"
+cmake --build .
+cmake --install .
 //! [8]
 
 
 //! [9]
-set PATH=%PATH%;c:\oracle\bin
+set PATH=%PATH%;C:\oracle
 //! [9]
 
 
 //! [11]
-cd $QTDIR/qtbase/src/plugins/sqldrivers
-qmake -- ODBC_PREFIX=/usr/local/unixODBC
-make sub-odbc
+mkdir build-sqldrivers
+cd build-sqldrivers
+qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DODBC_INCLUDE_DIR="/usr/local/unixODBC/include" -DODBC_LIBRARY="/usr/local/unixODBC/lib/libodbc.<so|dylib>"
+cmake --build .
+cmake --install .
 //! [11]
 
 
 //! [12]
-cd %QTDIR%\qtbase\src\plugins\sqldrivers
-qmake
-nmake sub-odbc
+mkdir build-sqldrivers
+cd build-sqldrivers
+qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform>
+cmake --build .
+cmake --install .
 //! [12]
 
 
 //! [13]
-cd $QTDIR/qtbase/src/plugins/sqldrivers
-qmake -- PSQL_INCDIR=/usr/include/pgsql
-make sub-psql
+mkdir build-psql-driver
+cd build-psql-driver
+
+qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers-DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DCMAKE_INCLUDE_PATH="/usr/local/pgsql/include" -DCMAKE_LIBRARY_PATH="/usr/local/pgsql/lib"
+cmake --build .
+cmake --install .
 //! [13]
 
 
 //! [15]
-cd %QTDIR%\qtbase\src\plugins\sqldrivers
-qmake -- PSQL_INCDIR=C:/psql/include PSQL_LIBDIR=C:/psql/lib/ms
-nmake sub-psql
-nmake install
+mkdir build-sqldrivers
+cd build-sqldrivers
+qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DCMAKE_INCLUDE_PATH="C:\pgsql\include" -DCMAKE_LIBRARY_PATH="C:\pgsql\lib"
+cmake --build .
+cmake --install .
 //! [15]
 
 
 //! [18]
-cd $QTDIR/qtbase/src/plugins/sqldrivers
-qmake -- DB2_PREFIX=$DB2DIR
-make sub-db2
+mkdir build-sqldrivers
+cd build-sqldrivers
+qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DDB2_INCLUDE_DIR="/usr/local/db2/include" -DDB2_LIBRARY="/usr/local/db2/lib/libdb2.<so|dylib>"
+cmake --build .
+cmake --install .
 //! [18]
 
 
 //! [20]
-cd %QTDIR%\qtbase\src\plugins\sqldrivers
-qmake -- DB2_PREFIX="<DB2 home>/sqllib"
-nmake sub-db2
-nmake install
+mkdir build-sqldrivers
+cd build-sqldrivers
+qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DDB2_INCLUDE_DIR="C:\db2\include" -DDB2_LIBRARY="C:\db2\lib\db2.lib"
+cmake --build .
+cmake --install .
 //! [20]
 
 
 //! [21]
-cd $QTDIR/qtbase/src/plugins/sqldrivers
-qmake -- -system-sqlite SQLITE3_PREFIX=$SQLITE
-make sub-sqlite
+mkdir build-sqldrivers
+cd build-sqldrivers
+qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DFEATURE_system_sqlite=ON -DCMAKE_INCLUDE_PATH="$SQLITE/include" -DCMAKE_LIBRARY_PATH="$SQLITE/lib"
+cmake --build .
+cmake --install .
 //! [21]
 
 
 //! [23]
-cd %QTDIR%\qtbase\src\plugins\sqldrivers
-qmake -- -system-sqlite SQLITE3_PREFIX=C:/SQLITE
-nmake sub-sqlite
-nmake install
+mkdir build-sqldrivers
+cd build-sqldrivers
+qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DFEATURE_system_sqlite=ON -DCMAKE_INCLUDE_PATH="C:\SQLITE\include" -DCMAKE_LIBRARY_PATH="C:\SQLITE\lib"
+cmake --build .
+cmake --install .
 //! [23]
 
 
 //! [27]
-cd $QTDIR/qtbase/src/plugins/sqldrivers
-qmake -- IBASE_PREFIX=/opt/interbase
-make sub-ibase
+mkdir build-sqldrivers
+cd build-sqldrivers
+qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DInterbase_INCLUDE_DIR="/opt/interbase/include" -DInterbase_LIBRARY="/opt/interbase/lib/libgds.<so|dylib>"
+cmake --build .
+cmake --install .
 //! [27]
 
 
 //! [28]
-cd $QTDIR/qtbase/src/plugins/sqldrivers
-qmake -- IBASE_PREFIX=/opt/interbase IBASE_LIBS=-lfbclient
-make sub-ibase
+mkdir build-sqldrivers
+cd build-sqldrivers
+qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DInterbase_INCLUDE_DIR="/opt/interbase/include" -DInterbase_LIBRARY="/opt/interbase/lib/libfbclient.<so|dylib>"
+cmake --build .
+cmake --install .
 //! [28]
 
 
 //! [29]
-cd %QTDIR%\qtbase\src\plugins\sqldrivers
-qmake -- IBASE_INCDIR=C:/interbase/include
-nmake sub-ibase
-nmake install
+mkdir build-sqldrivers
+cd build-sqldrivers
+qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DInterbase_INCLUDE_DIR="C:\interbase\include" -DInterbase_LIBRARY="C:\interbase\gds.lib"
+cmake --build .
+cmake --install .
 //! [29]
 
 
 //! [30]
-cd %QTDIR%\qtbase\src\plugins\sqldrivers
-qmake -- IBASE_INCDIR=C:/interbase/include IBASE_LIBS=-lfbclient
-nmake sub-ibase
-nmake install
+mkdir build-sqldrivers
+cd build-sqldrivers
+qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DInterbase_INCLUDE_DIR="C:\interbase\include" -DInterbase_LIBRARY="C:\interbase\lib\fbclient_ms.lib"
+cmake --build .
+cmake --install .
 //! [30]
 
+//! [31]
+mkdir build-sqldrivers
+cd build-sqldrivers
 
-//! [32]
-configure OCI_INCDIR=/usr/include/oracle/10.1.0.3/client OCI_LIBDIR=/usr/lib/oracle/10.1.0.3/client/lib -R /usr/lib/oracle/10.1.0.3/client/lib OCI_LIBS="-lclntsh -lnnz10"
-make
-//! [32]
+qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DMimer_INCLUDE_DIR="/usr/include" -DMimer_LIBRARIES="/usr/lib/libmimer.so"
+cmake --build .
+cmake --install .
+//! [31]
 
-//! [33]
-cd $QTDIR/qtbase/src/plugins/sqldrivers
-qmake -- OCI_INCDIR=/usr/include/oracle/10.1.0.3/client OCI_LIBDIR=/usr/lib/oracle/10.1.0.3/client/lib OCI_LIBS="-Wl,-rpath,/usr/lib/oracle/10.1.0.3/client/lib -lclntsh -lnnz10"
-make sub-oci
-//! [33]
+//! [32]
+mkdir build-sqldrivers
+cd build-sqldrivers
 
+qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DMimer_INCLUDE_DIR="C:\Program Files\Mimer SQL Experience 11.0\dev\include" -DMimer_LIBRARIES="C:\Program Files\Mimer SQL Experience 11.0\dev\lib\amd64\mimapi64.lib|C:\Program Files\Mimer SQL Experience 11.0\dev\lib\x86\mimapi32.lib"
+cmake --build .
+cmake --install .
+//! [32]
 
 //! [35]
 QSqlDatabase: QPSQL driver not loaded
@@ -236,36 +216,65 @@ QSqlRecord rec = database.record(tableString.toLower());
 //! [40]
 
 //! [41]
-C:\Qt5\5.13.2\Src\qtbase\src\plugins\sqldrivers>qmake -version
-QMake version 3.1
-Using Qt version 5.13.2 in C:/Qt5/5.13.2/mingw73_64/lib
-C:\Qt5\5.13.2\Src\qtbase\src\plugins\sqldrivers>qmake -- MYSQL_INCDIR="C:/Program Files/MySQL/MySQL Connector C 6.1/include" MYSQL_LIBDIR="C:/Program Files/MySQL/MySQL Connector C 6.1/lib"
-Info: creating stash file C:\Qt5\5.13.2\Src\qtbase\src\plugins\sqldrivers\.qmake.stash
-
-Running configuration tests...
-Checking for DB2 (IBM)... no
-Checking for InterBase... no
-Checking for MySQL... yes
-Checking for OCI (Oracle)... no
-Checking for ODBC... yes
-Checking for PostgreSQL... no
-Done running configuration tests.
+C:\Qt\6.0.0\mingw81_64\bin\qt-cmake -G Ninja C:\Qt\6.0.0\Src\qtbase\src\plugins\sqldrivers -DMySQL_INCLUDE_DIR="C:\mysql-8.0.22-winx64\include" -DMySQL_LIBRARY="C:\mysql-8.0.22-winx64\lib\libmysql.lib" -DCMAKE_INSTALL_PREFIX="C:\Qt\6.0.0\mingw81_64"
+Configure summary:
 
+Qt Sql Drivers:
+  DB2 (IBM) .............................. no
+  InterBase .............................. no
+  Mimer SQL .............................. yes
+  MySql .................................. yes
+  OCI (Oracle) ........................... no
+  ODBC ................................... yes
+  PostgreSQL ............................. no
+  SQLite ................................. yes
+    Using system provided SQLite ......... no
+
+-- Configuring done
+-- Generating done
+-- Build files have been written to: C:/build-qt6-sqldrivers
+//! [41]
+
+//! [42]
+C:\Qt\6.0.0\Src\configure.bat -sql-mysql -- -DMySQL_INCLUDE_DIR="C:\mysql-8.0.22-winx64\include" -DMySQL_LIBRARY="C:\mysql-8.0.22-winx64\lib\libmysql.lib"
 Configure summary:
 
+...
 Qt Sql Drivers:
   DB2 (IBM) .............................. no
   InterBase .............................. no
+  Mimer SQL .............................. yes
   MySql .................................. yes
   OCI (Oracle) ........................... no
   ODBC ................................... yes
   PostgreSQL ............................. no
   SQLite ................................. yes
     Using system provided SQLite ......... no
+...
+//! [42]
 
-Qt is now configured for building. Just run 'mingw32-make'.
-Once everything is built, you must run 'mingw32-make install'.
-Qt will be installed into 'C:\Qt5\5.13.2\mingw73_64'.
+//! [43]
+C:\Qt\6.0.0\Src\configure.bat -sql-mysql -- -DCMAKE_INCLUDE_PATH="C:\mysql-8.0.22-winx64\include" -DCMAKE_LIBRARY_PATH="C:\mysql-8.0.22-winx64\lib"
+Configure summary:
 
-Prior to reconfiguration, make sure you remove any leftovers from the previous build.
-//! [41]
+...
+Qt Sql Drivers:
+  DB2 (IBM) .............................. no
+  InterBase .............................. no
+  Mimer SQL .............................. yes
+  MySql .................................. yes
+  OCI (Oracle) ........................... no
+  ODBC ................................... yes
+  PostgreSQL ............................. no
+  SQLite ................................. yes
+    Using system provided SQLite ......... no
+...
+//! [43]
+
+//! [44]
+create procedure inout_proc (INOUT param1 INT, OUT param2 INT)
+BEGIN
+    set param1 = param1 * 2;
+    set param2 = param1 * param1;
+END
+//! [44]