From 947d1eaaa470c310351756caa506e35b5cd3c122 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Fri, 31 Jan 2020 22:02:03 +0100 Subject: QtSQL: remove SQLite2 and TDS driver for Qt6 They were deprecated in Qt4 (TDS) and 5.14 (SQLITE2) so they can be removed now in Qt6 [ChangeLog][QtSql] Removed obsolete TDS and Sqlite2 drivers Change-Id: I55118fb03106564d519a99ab55f9b5cf528179f3 Reviewed-by: Andy Shaw --- src/sql/doc/snippets/code/doc_src_sql-driver.qdoc | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'src/sql/doc/snippets/code') 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 b869b309b7..c7cc06bca5 100644 --- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc +++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc @@ -54,7 +54,7 @@ Database options: -sql- ........ Enable SQL plugin. Supported drivers: - db2 ibase mysql oci odbc psql sqlite2 sqlite tds + db2 ibase mysql oci odbc psql sqlite [all auto] -sqlite .............. Select used sqlite3 [system/qt] @@ -146,21 +146,6 @@ nmake install //! [15] -//! [16] -cd $QTDIR/qtbase/src/plugins/sqldrivers -qmake -- TDS_PREFIX=$SYBASE -make sub-tds -//! [16] - - -//! [17] -cd %QTDIR%\qtbase\src\plugins\sqldrivers -qmake -nmake sub-tds -nmake install -//! [17] - - //! [18] cd $QTDIR/qtbase/src/plugins/sqldrivers qmake -- DB2_PREFIX=$DB2DIR @@ -271,8 +256,6 @@ Checking for MySQL... yes Checking for OCI (Oracle)... no Checking for ODBC... yes Checking for PostgreSQL... no -Checking for SQLite (version 2)... no -Checking for TDS (Sybase)... no Done running configuration tests. Configure summary: @@ -284,10 +267,8 @@ Qt Sql Drivers: OCI (Oracle) ........................... no ODBC ................................... yes PostgreSQL ............................. no - SQLite2 ................................ no SQLite ................................. yes Using system provided SQLite ......... no - TDS (Sybase) ........................... no Qt is now configured for building. Just run 'mingw32-make'. Once everything is built, you must run 'mingw32-make install'. -- cgit v1.2.3