Martchus
f98e3bef4b
* Update patch for static freetype2 in qt5 for brotli library renaming * Update patches for Qt 5 SQL drivers to include crypt32 * This library is required by OpenSSL's crypto library. Not sure why there were no linker errors before.
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
From 1ebf69214e4ef2269ab0135d126ce5d9bba2fa04 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 18 Sep 2016 18:56:55 +0200
|
|
Subject: [PATCH 13/32] Fix linking against shared/static MariaDB
|
|
|
|
Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
|
|
---
|
|
src/plugins/sqldrivers/configure.json | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
|
|
index 28ccbeadcd..a5e3001bf6 100644
|
|
--- a/src/plugins/sqldrivers/configure.json
|
|
+++ b/src/plugins/sqldrivers/configure.json
|
|
@@ -67,6 +67,8 @@
|
|
},
|
|
"headers": "mysql.h",
|
|
"sources": [
|
|
+ { "libs": "-lmariadbclient -lssl -lcrypto -lcrypt32 -lshlwapi -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" },
|
|
+ { "libs": "-lmariadb", "condition": "config.win32 && features.shared" },
|
|
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true },
|
|
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
|
|
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
|
|
--
|
|
2.43.0
|
|
|