summaryrefslogtreecommitdiffstats
path: root/src/plugins/sqldrivers/configure.json
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-12-30 19:42:33 +0100
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2020-01-03 14:55:48 +0100
commitb3f94eba6d4a329b5c64c7fb60ba33e3a8df301e (patch)
treedcf9aefbf25f015875590c134491161fa4f2ad14 /src/plugins/sqldrivers/configure.json
parent947704cefe9e8723c8c9bb332268dcedb1ea1060 (diff)
SQL: add proper support to build QMYSQL with MariaDB client libraries
The QMYSQL plugin can also be build with the MariaDB client libraries since they are source compatible. But the MariaDB libraries could not be found on windows because the library name differs. Therefore add the correct library names and update the documentation to make clear that MariaDB is supported through the QMYSQL plugin. [ChangeLog][Sql][QMYSQL] The QMYSQL plugin can now be build with the MariaDB C connector libs on Windows. Change-Id: Id99f8be96c4179fd2321b3e61c90bb300c53bb82 Reviewed-by: Marius Kittler <mariuskittler@gmx.de> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src/plugins/sqldrivers/configure.json')
-rw-r--r--src/plugins/sqldrivers/configure.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
index cd20eef1df..28ccbeadcd 100644
--- a/src/plugins/sqldrivers/configure.json
+++ b/src/plugins/sqldrivers/configure.json
@@ -72,7 +72,9 @@
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": false },
{ "libs": "-lmysqlclient_r", "condition": "!config.win32" },
+ { "libs": "-llibmariadb", "condition": "config.win32" },
{ "libs": "-llibmysql", "condition": "config.win32" },
+ { "libs": "-lmariadb", "condition": "!config.win32" },
{ "libs": "-lmysqlclient", "condition": "!config.win32" }
]
},