summaryrefslogtreecommitdiffstats
path: root/src/sql/doc/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-16 07:58:32 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-16 07:58:32 +0200
commit17198e03ab36e5f579a1477b09cc3e601975eb5f (patch)
tree61ba826e9edd53469abdc1e1f58b1223d0336c56 /src/sql/doc/src
parenta5e89005445ac8ca18ac046eaf55fe2230e47cd6 (diff)
parent2e2b32a9ab459f6618d02e4b454c75a787172def (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/global/qglobal.cpp src/corelib/tools/qstring.cpp src/network/socket/qabstractsocket.cpp src/network/socket/qnativesocketengine_unix.cpp src/plugins/platforms/eglfs/api/qeglfsglobal.h Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
Diffstat (limited to 'src/sql/doc/src')
-rw-r--r--src/sql/doc/src/sql-driver.qdoc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc
index ddf6e74618..a33f60b561 100644
--- a/src/sql/doc/src/sql-driver.qdoc
+++ b/src/sql/doc/src/sql-driver.qdoc
@@ -77,7 +77,7 @@
\target building
\section1 Building the Drivers Using Configure
- On Unix and OS X, the Qt \c configure script tries to
+ On Unix and \macos, the Qt \c configure script tries to
automatically detect the available client libraries on your
machine. Run \c{configure -help} to see what drivers can be
built. You should get an output similar to this:
@@ -139,7 +139,7 @@
Please refer to the MySQL documentation, chapter "libmysqld, the Embedded
MySQL Server Library" for more information about the MySQL embedded server.
- \section3 How to Build the QMYSQL Plugin on Unix and OS X
+ \section3 How to Build the QMYSQL Plugin on Unix and \macos
You need the MySQL header files and as well as the shared library
\c{libmysqlclient.so}. Depending on your Linux distribution you may
@@ -208,7 +208,7 @@
BLOBs are bound to placeholders or QSqlTableModel, which uses a prepared
query to do this internally.
- \section3 How to Build the OCI Plugin on Unix and OS X
+ \section3 How to Build the OCI Plugin on Unix and \macos
For Oracle 10g, all you need is the "Instant Client Package - Basic" and
"Instant Client Package - SDK". For Oracle prior to 10g, you require
@@ -343,7 +343,7 @@
"SQL_WCHAR support" in the ODBC driver manager otherwise Oracle
will convert all Unicode strings to local 8-bit.
- \section3 How to Build the ODBC Plugin on Unix and OS X
+ \section3 How to Build the ODBC Plugin on Unix and \macos
It is recommended that you use unixODBC. You can find the latest
version and ODBC drivers at \l http://www.unixodbc.org.
@@ -400,7 +400,7 @@
Binary Large Objects are supported through the \c BYTEA field type in
PostgreSQL server versions >= 7.1.
- \section3 How to Build the QPSQL Plugin on Unix and OS X
+ \section3 How to Build the QPSQL Plugin on Unix and \macos
You need the PostgreSQL client library and headers installed.
@@ -440,7 +440,7 @@
Sybase client library. Refer to the Sybase documentation for information on how to set up
a Sybase client configuration file to enable connections to databases on non-default ports.
- \section3 How to Build the QTDS Plugin on Unix and OS X
+ \section3 How to Build the QTDS Plugin on Unix and \macos
Under Unix, two libraries are available which support the TDS protocol:
@@ -493,7 +493,7 @@
We suggest using a forward-only query when calling stored procedures
in DB2 (see QSqlQuery::setForwardOnly()).
- \section3 How to Build the QDB2 Plugin on Unix and OS X
+ \section3 How to Build the QDB2 Plugin on Unix and \macos
\snippet code/doc_src_sql-driver.qdoc 18
@@ -643,7 +643,7 @@
\snippet code/doc_src_sql-driver.cpp 26
- \section3 How to Build the QIBASE Plugin on Unix and OS X
+ \section3 How to Build the QIBASE Plugin on Unix and \macos
The following assumes InterBase or Firebird is installed in
\c{/opt/interbase}: