diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-02-27 14:22:01 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-02-27 14:22:01 +0100 |
| commit | 5c6c0289f09d9bf18aaa35eed792e40840af5dce (patch) | |
| tree | be49cdea36de09b01b570af3bdc7f0a95f5dd02e /src/sql | |
| parent | 469c3338407a5cf74c5e35c43ebb48c14e21ecac (diff) | |
| parent | e30aa59a897ca3849fb99c6393cfb426ed22d33b (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I4212d070d5752275085e754b96f0392113604dba
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/doc/src/sql-driver.qdoc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc index e77cc772e6..7736591ae9 100644 --- a/src/sql/doc/src/sql-driver.qdoc +++ b/src/sql/doc/src/sql-driver.qdoc @@ -183,7 +183,7 @@ Run the installer, select custom installation and install the MySQL C Connector which matches your Qt installation (x86 or x64). - After installation make sure that the needed files are there: + After installation check that the needed files are there: \list \li \c {<MySQL dir>/lib/libmysql.lib} \li \c {<MySQL dir>/lib/libmysql.dll} @@ -196,16 +196,20 @@ \li \c {<MariaDB dir>/include/mysql.h} \endlist - Build the plugin as follows (here it is assumed that the MySQL - C Connector is installed in + \note As of MySQL 8.0.19, the C Connector is no longer offered as a standalone + installable component. Instead, you can get \c{mysql.h} and \c{libmysql.*} by + installing the full MySQL Server (x64 only) or the + \l{https://downloads.mariadb.org/connector-c/}{MariaDB C Connector}. + + Build the plugin as follows (here it is assumed that \c{<MySQL dir>} is \c{C:/Program Files/MySQL/MySQL Connector C 6.1}): \snippet code/doc_src_sql-driver.qdoc 5 If you are not using a Microsoft compiler, replace \c nmake with \c - mingw32-make in the line above. + mingw32-make above. - When you distribute your application, remember to include libmysql.dll / libmariadb.dll + When you distribute your application, remember to include \e libmysql.dll / \e libmariadb.dll in your installation package. It must be placed in the same folder as the application executable. \e libmysql.dll additionally needs the MSVC runtime libraries which can be installed with |