From bf9f0844c232d5395b32ab8e3bbe644a8af310f7 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 6 Oct 2021 08:34:11 +0200 Subject: [PATCH] Doc: Fix cmake build/install commands in SQL driver documentation Pick-to: 6.2 Fixes: QTBUG-97098 Change-Id: I1c5214d66341aa412c5fc9b2de6d0e26ba4612aa Reviewed-by: Paul Wicking --- .../doc/snippets/code/doc_src_sql-driver.qdoc | 65 +++++++++---------- 1 file changed, 32 insertions(+), 33 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 97f7e5171a0..5f297866f32 100644 --- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc +++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc @@ -76,8 +76,8 @@ 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 --build . -qt-cmake --install +cmake --build . +cmake --install . //! [3] @@ -86,8 +86,8 @@ 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 --build . -qt-cmake --install +cmake --build . +cmake --install . //! [5] @@ -96,8 +96,8 @@ 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 --build . -qt-cmake --install +cmake --build . +cmake --install . //! [7] @@ -105,8 +105,8 @@ qt-cmake --install 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 --build . -qt-cmake --install +cmake --build . +cmake --install . //! [8] @@ -120,8 +120,8 @@ 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 --build . -qt-cmake --install +cmake --build . +cmake --install . //! [11] @@ -130,8 +130,8 @@ mkdir build-sqldrivers cd build-sqldrivers qt-cmake -G"Ninja" \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -qt-cmake --build . -qt-cmake --install +cmake --build . +cmake --install . //! [12] @@ -140,8 +140,8 @@ 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 --build . -qt-cmake --install +cmake --build . +cmake --install . //! [13] @@ -150,8 +150,8 @@ 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 --build . -qt-cmake --install +cmake --build . +cmake --install . //! [15] @@ -160,8 +160,8 @@ 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 --build . -qt-cmake --install +cmake --build . +cmake --install . //! [18] @@ -170,8 +170,8 @@ 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 --build . -qt-cmake --install +cmake --build . +cmake --install . //! [20] @@ -180,8 +180,8 @@ 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 --build . -qt-cmake --install +cmake --build . +cmake --install . //! [21] @@ -190,8 +190,8 @@ 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 --build . -qt-cmake --install +cmake --build . +cmake --install . //! [23] @@ -200,8 +200,8 @@ 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 --build . -qt-cmake --install +cmake --build . +cmake --install . //! [27] @@ -210,8 +210,8 @@ 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 --build . -qt-cmake --install +cmake --build . +cmake --install . //! [28] @@ -220,8 +220,8 @@ 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 --build . -qt-cmake --install +cmake --build . +cmake --install . //! [29] @@ -230,8 +230,8 @@ 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 --build . -qt-cmake --install +cmake --build . +cmake --install . //! [30] @@ -311,4 +311,3 @@ Qt Sql Drivers: Using system provided SQLite ......... no ... //! [43] -