Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I469b0501cc65fc5ce4d797a69ae89405cc69c7f8

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 95fa8355c7..28e17d2301 100644
--- a/src/sql/doc/src/sql-driver.qdoc
+++ b/src/sql/doc/src/sql-driver.qdoc
@@ -181,7 +181,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}
@@ -194,16 +194,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