From 65cc6ec16bd724f96007748823bb8902e3a7881b Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 6 Jan 2021 14:45:33 +0100 Subject: Adjust sql drivers documentation to cmake Update sql drivers build procedure description. Fixes: QTBUG-89782 Change-Id: I152fad108e24d394c8d21adf95ce6dbd6e7d80bc Reviewed-by: Joerg Bornemann --- src/sql/doc/snippets/code/doc_src_sql-driver.qdoc | 229 +++++++++++++--------- 1 file changed, 136 insertions(+), 93 deletions(-) (limited to 'src/sql/doc/snippets') 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..97f7e5171a 100644 --- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc +++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc @@ -56,7 +56,7 @@ Database options: -sql- ........ Enable SQL 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,145 +70,169 @@ BEGIN END //! [1] -//! [3] -cd $QTDIR/qtbase/src/plugins/sqldrivers -qmake -- MYSQL_PREFIX=/usr/local -make sub-mysql -//! [3] +//! [3] +mkdir build-sqldrivers +cd build-sqldrivers -//! [4] -cd $QTDIR/qtbase/src/plugins/sqldrivers/mysql -make install -//! [4] +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 +//! [3] //! [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" \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 //! [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" /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 //! [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" \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 //! [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" /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 //! [11] //! [12] -cd %QTDIR%\qtbase\src\plugins\sqldrivers -qmake -nmake sub-odbc +mkdir build-sqldrivers +cd build-sqldrivers + +qt-cmake -G"Ninja" \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ +qt-cmake --build . +qt-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" /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 //! [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" \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 //! [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" /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 //! [18] //! [20] -cd %QTDIR%\qtbase\src\plugins\sqldrivers -qmake -- DB2_PREFIX="/sqllib" -nmake sub-db2 -nmake 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 --build . +qt-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" /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 //! [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" \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 //! [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" /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 //! [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" /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 //! [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" \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 //! [29] //! [30] -cd %QTDIR%\qtbase\src\plugins\sqldrivers -qmake -- IBASE_INCDIR=C:/interbase/include IBASE_LIBS=-lfbclient -nmake sub-ibase -nmake install -//! [30] +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] - -//! [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] +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 +//! [30] //! [35] @@ -236,23 +260,29 @@ 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 + 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 @@ -262,10 +292,23 @@ Qt Sql Drivers: 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: + +... +Qt Sql Drivers: + DB2 (IBM) .............................. no + InterBase .............................. no + MySql .................................. yes + OCI (Oracle) ........................... no + ODBC ................................... yes + PostgreSQL ............................. no + SQLite ................................. yes + Using system provided SQLite ......... no +... +//! [43] -Prior to reconfiguration, make sure you remove any leftovers from the previous build. -//! [41] -- cgit v1.2.3