From 08a0ba5733c0b01d9ff65ccffcc3b9ba77df7af9 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 6 Oct 2021 08:45:45 +0200 Subject: [PATCH] Doc: Prettify -G cmake arguments in SQL drivers documentation Use '-G Ninja' instead of '-G"Ninja"'. Pick-to: 6.2 Change-Id: I53a77ea3b2d1547bb516b3ab756f5ae0f24092b1 Reviewed-by: Paul Wicking --- .../doc/snippets/code/doc_src_sql-driver.qdoc | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 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 5f297866f32..510a490217e 100644 --- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc +++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc @@ -75,7 +75,7 @@ END mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G"Ninja" /Src/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DMySQL_INCLUDE_DIR="/usr/local/mysql/include" -DMySQL_LIBRARY="/usr/local/mysql/lib/libmysqlclient." +qt-cmake -G Ninja /Src/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DMySQL_INCLUDE_DIR="/usr/local/mysql/include" -DMySQL_LIBRARY="/usr/local/mysql/lib/libmysqlclient." cmake --build . cmake --install . //! [3] @@ -85,7 +85,7 @@ cmake --install . mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G"Ninja" \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -DMySQL_INCLUDE_DIR="C:\mysql-8.0.22-winx64\include" -DMySQL_LIBRARY="C:\mysql-8.0.22-winx64\lib\libmysql.lib" +qt-cmake -G Ninja \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -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] @@ -95,7 +95,7 @@ cmake --install . mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G"Ninja" /Src/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DOracle_INCLUDE_DIR="/usr/include/oracle/21/client64" -DOracle_LIBRARY="/usr/lib/oracle/21/client64/lib/libclntsh." +qt-cmake -G Ninja /Src/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DOracle_INCLUDE_DIR="/usr/include/oracle/21/client64" -DOracle_LIBRARY="/usr/lib/oracle/21/client64/lib/libclntsh." cmake --build . cmake --install . //! [7] @@ -104,7 +104,7 @@ cmake --install . //! [8] mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G"Ninja" \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -DOracle_INCLUDE_DIR="C:\oracle\sdk\include" -DOracle_LIBRARY="C:\oracle\oci.lib" +qt-cmake -G Ninja \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -DOracle_INCLUDE_DIR="C:\oracle\sdk\include" -DOracle_LIBRARY="C:\oracle\oci.lib" cmake --build . cmake --install . //! [8] @@ -119,7 +119,7 @@ set PATH=%PATH%;C:\oracle mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G"Ninja" /Src/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DODBC_INCLUDE_DIR="/usr/local/unixODBC/include" -DODBC_LIBRARY="/usr/local/unixODBC/lib/libodbc." +qt-cmake -G Ninja /Src/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DODBC_INCLUDE_DIR="/usr/local/unixODBC/include" -DODBC_LIBRARY="/usr/local/unixODBC/lib/libodbc." cmake --build . cmake --install . //! [11] @@ -129,7 +129,7 @@ cmake --install . mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G"Ninja" \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ +qt-cmake -G Ninja \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ cmake --build . cmake --install . //! [12] @@ -139,7 +139,7 @@ cmake --install . mkdir build-psql-driver cd build-psql-driver -qt-cmake -G"Ninja" /Src/qtbase/src/plugins/sqldrivers-DCMAKE_INSTALL_PREFIX=/ -DCMAKE_INCLUDE_PATH="/usr/local/pgsql/include" -DCMAKE_LIBRARY_PATH="/usr/local/pgsql/lib" +qt-cmake -G Ninja /Src/qtbase/src/plugins/sqldrivers-DCMAKE_INSTALL_PREFIX=/ -DCMAKE_INCLUDE_PATH="/usr/local/pgsql/include" -DCMAKE_LIBRARY_PATH="/usr/local/pgsql/lib" cmake --build . cmake --install . //! [13] @@ -149,7 +149,7 @@ cmake --install . mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G"Ninja" \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -DCMAKE_INCLUDE_PATH="C:\pgsql\include" -DCMAKE_LIBRARY_PATH="C:\pgsql\lib" +qt-cmake -G Ninja \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -DCMAKE_INCLUDE_PATH="C:\pgsql\include" -DCMAKE_LIBRARY_PATH="C:\pgsql\lib" cmake --build . cmake --install . //! [15] @@ -159,7 +159,7 @@ cmake --install . mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G"Ninja" /Src/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DDB2_INCLUDE_DIR="/usr/local/db2/include" -DDB2_LIBRARY="/usr/local/db2/lib/libdb2." +qt-cmake -G Ninja /Src/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DDB2_INCLUDE_DIR="/usr/local/db2/include" -DDB2_LIBRARY="/usr/local/db2/lib/libdb2." cmake --build . cmake --install . //! [18] @@ -169,7 +169,7 @@ cmake --install . mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G"Ninja" \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -DDB2_INCLUDE_DIR="C:\db2\include" -DDB2_LIBRARY="C:\db2\lib\db2.lib" +qt-cmake -G Ninja \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -DDB2_INCLUDE_DIR="C:\db2\include" -DDB2_LIBRARY="C:\db2\lib\db2.lib" cmake --build . cmake --install . //! [20] @@ -179,7 +179,7 @@ cmake --install . mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G"Ninja" /Src/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DFEATURE_system_sqlite=ON -DCMAKE_INCLUDE_PATH="$SQLITE/include" -DCMAKE_LIBRARY_PATH="$SQLITE/lib" +qt-cmake -G Ninja /Src/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DFEATURE_system_sqlite=ON -DCMAKE_INCLUDE_PATH="$SQLITE/include" -DCMAKE_LIBRARY_PATH="$SQLITE/lib" cmake --build . cmake --install . //! [21] @@ -189,7 +189,7 @@ cmake --install . mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G"Ninja" \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -DFEATURE_system_sqlite=ON -DCMAKE_INCLUDE_PATH="C:\SQLITE\include" -DCMAKE_LIBRARY_PATH="C:\SQLITE\lib" +qt-cmake -G Ninja \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -DFEATURE_system_sqlite=ON -DCMAKE_INCLUDE_PATH="C:\SQLITE\include" -DCMAKE_LIBRARY_PATH="C:\SQLITE\lib" cmake --build . cmake --install . //! [23] @@ -199,7 +199,7 @@ cmake --install . mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G"Ninja" /Src/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DInterbase_INCLUDE_DIR="/opt/interbase/include" -DInterbase_LIBRARY="/opt/interbase/lib/libgds." +qt-cmake -G Ninja /Src/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DInterbase_INCLUDE_DIR="/opt/interbase/include" -DInterbase_LIBRARY="/opt/interbase/lib/libgds." cmake --build . cmake --install . //! [27] @@ -209,7 +209,7 @@ cmake --install . mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G"Ninja" /Src/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DInterbase_INCLUDE_DIR="/opt/interbase/include" -DInterbase_LIBRARY="/opt/interbase/lib/libfbclient." +qt-cmake -G Ninja /Src/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DInterbase_INCLUDE_DIR="/opt/interbase/include" -DInterbase_LIBRARY="/opt/interbase/lib/libfbclient." cmake --build . cmake --install . //! [28] @@ -219,7 +219,7 @@ cmake --install . mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G"Ninja" \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -DInterbase_INCLUDE_DIR="C:\interbase\include" -DInterbase_LIBRARY="C:\interbase\gds.lib" +qt-cmake -G Ninja \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -DInterbase_INCLUDE_DIR="C:\interbase\include" -DInterbase_LIBRARY="C:\interbase\gds.lib" cmake --build . cmake --install . //! [29] @@ -229,7 +229,7 @@ cmake --install . mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G"Ninja" \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -DInterbase_INCLUDE_DIR="C:\interbase\include" -DInterbase_LIBRARY="C:\interbase\lib\fbclient_ms.lib" +qt-cmake -G Ninja \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -DInterbase_INCLUDE_DIR="C:\interbase\include" -DInterbase_LIBRARY="C:\interbase\lib\fbclient_ms.lib" cmake --build . cmake --install . //! [30] @@ -260,7 +260,7 @@ QSqlRecord rec = database.record(tableString.toLower()); //! [40] //! [41] -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" +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: