Doc: Update sql-driver to reflect current minimum versions needed

Fixes: QTBUG-85172
Change-Id: I82a8e008deec29dd217097b8427cb84b80c3a1c9
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
This commit is contained in:
Andy Shaw 2020-07-18 09:46:51 +02:00
parent 1b72f9676f
commit e9932f6372
2 changed files with 13 additions and 24 deletions

View File

@ -91,16 +91,9 @@ nmake install
//! [5] //! [5]
//! [6]
cd $QTDIR/qtbase/src/plugins/sqldrivers
qmake -- OCI_INCDIR="$ORACLE_HOME/rdbms/public" OCI_LIBDIR="$ORACLE_HOME/lib" OCI_LIBS="-lclntsh -lwtc9"
make sub-oci
//! [6]
//! [7] //! [7]
cd $QTDIR/qtbase/src/plugins/sqldrivers 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 qmake -- OCI_INCDIR=/usr/include/oracle/11.2/client OCI_LIBDIR=/usr/lib/oracle/11.2/client/lib
make sub-oci make sub-oci
//! [7] //! [7]

View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the documentation of the Qt Toolkit. ** This file is part of the documentation of the Qt Toolkit.
@ -48,8 +48,8 @@
\header \li Driver name \li DBMS \header \li Driver name \li DBMS
\row \li \l{#QDB2}{QDB2} \li IBM DB2 (version 7.1 and above) \row \li \l{#QDB2}{QDB2} \li IBM DB2 (version 7.1 and above)
\row \li \l{#QIBASE}{QIBASE} \li Borland InterBase \row \li \l{#QIBASE}{QIBASE} \li Borland InterBase
\row \li \l{#QMYSQL}{QMYSQL / MARIADB} \li MySQL or MariaDB (version 5.0 and above) \row \li \l{#QMYSQL}{QMYSQL / MARIADB} \li MySQL or MariaDB (version 5.6 and above)
\row \li \l{#QOCI}{QOCI} \li Oracle Call Interface Driver \row \li \l{#QOCI}{QOCI} \li Oracle Call Interface Driver (version 12.1 and above)
\row \li \l{#QODBC}{QODBC} \row \li \l{#QODBC}{QODBC}
\li Open Database Connectivity (ODBC) - Microsoft SQL Server and other \li Open Database Connectivity (ODBC) - Microsoft SQL Server and other
ODBC-compliant databases ODBC-compliant databases
@ -121,7 +121,7 @@
\section1 Driver Specifics \section1 Driver Specifics
\target QMYSQL \target QMYSQL
\section2 QMYSQL for MySQL or MariaDB 5 and higher \section2 QMYSQL for MySQL or MariaDB 5.6 and higher
MariaDB is a fork of MySQL intended to remain free and open-source software MariaDB is a fork of MySQL intended to remain free and open-source software
under the GNU General Public License. MariaDB intended to maintain high under the GNU General Public License. MariaDB intended to maintain high
@ -216,9 +216,10 @@
\target QOCI \target QOCI
\section2 QOCI for the Oracle Call Interface (OCI) \section2 QOCI for the Oracle Call Interface (OCI)
The Qt OCI plugin supports Oracle 9i, 10g and higher. After The Qt OCI plugin supports connecting to Oracle database as determined by
connecting to the Oracle server, the plugin will auto-detect the the version of the instant client used. This is dependent on what Oracle
database version and enable features accordingly. indicates it supports. The plugin will auto-detect the database version
and enable features accordingly.
It's possible to connect to a Oracle database without a tnsnames.ora file. It's possible to connect to a Oracle database without a tnsnames.ora file.
This requires that the database SID is passed to the driver as the database This requires that the database SID is passed to the driver as the database
@ -246,25 +247,20 @@
\section3 How to Build the OCI Plugin on Unix and \macos \section3 How to Build the OCI Plugin on Unix and \macos
For Oracle 10g, all you need is the "Instant Client Package - Basic" and All you need is the "Instant Client Package - Basic" and "Instant Client
"Instant Client Package - SDK". For Oracle prior to 10g, you require Package - SDK".
the standard Oracle client and the SDK packages.
Oracle library files required to build the driver: Oracle library files required to build the driver:
\list \list
\li \c libclntsh.so (all versions) \li \c libclntsh.so (all versions)
\li \c libwtc9.so (only Oracle 9)
\endlist \endlist
Tell \c qmake where to find the Oracle header files and shared Tell \c qmake where to find the Oracle header files and shared
libraries and run make: libraries and run make:
For Oracle version 9: We assume that you installed the RPM packages of the Instant Client Package SDK
\snippet code/doc_src_sql-driver.qdoc 6 (you need to adjust the version number accordingly):
For Oracle version 10, we assume that you installed the RPM packages of the
Instant Client Package SDK (you need to adjust the version number accordingly):
\snippet code/doc_src_sql-driver.qdoc 7 \snippet code/doc_src_sql-driver.qdoc 7
\b{Note:} If you are using the Oracle Instant Client package, \b{Note:} If you are using the Oracle Instant Client package,