diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-22 13:47:08 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-24 13:17:33 +0100 |
| commit | 502d3d6744913899da87acfda5ebdab42c40329e (patch) | |
| tree | 16658a328503bfd5a62b4fd5d69ffb66e9854b18 /src/plugins/sqldrivers/configure.json | |
| parent | d1be8b9ceb2c7b20bbe53a07154c79699540ea3d (diff) | |
| parent | 06bb315beb6c2c398223cfe52cbc7f66e14a8557 (diff) | |
Merge remote-tracking branch 'origin/dev' into merge-dev
Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739
Diffstat (limited to 'src/plugins/sqldrivers/configure.json')
| -rw-r--r-- | src/plugins/sqldrivers/configure.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json index 441cdc4885..94cf2dd4a5 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" } ] }, |