aboutsummarylogtreecommitdiffstats
path: root/0004-Fix-building-mysql-driver-under-mingw.patch
diff options
context:
space:
mode:
authorMartchus2017-02-09 21:00:00 +0100
committerMartchus2017-02-09 21:00:00 +0100
commit017bc5699e8507491c2acbe88d0fd51185422c11 (patch)
tree13b401ebe2f19ba3c953534dbb1afa4c8f23b2a5 /0004-Fix-building-mysql-driver-under-mingw.patch
parentd5440cf4c6f5db8ea6794b1bdc895ceb9bc55efc (diff)
downloadaur-017bc5699e8507491c2acbe88d0fd51185422c11.tar.gz
Update to 5.8.0
Diffstat (limited to '0004-Fix-building-mysql-driver-under-mingw.patch')
-rw-r--r--0004-Fix-building-mysql-driver-under-mingw.patch25
1 files changed, 0 insertions, 25 deletions
diff --git a/0004-Fix-building-mysql-driver-under-mingw.patch b/0004-Fix-building-mysql-driver-under-mingw.patch
deleted file mode 100644
index 81a3038c3fa9..000000000000
--- a/0004-Fix-building-mysql-driver-under-mingw.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1188f25bbc6ccd2fce5b080b98862aeb8420fc94 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Tue, 6 Oct 2015 09:53:20 +0200
-Subject: [PATCH 04/26] Fix building mysql driver under mingw
-
----
- src/sql/drivers/mysql/qsql_mysql.pri | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri
-index 3cfb6144a1..8b7063f1e4 100644
---- a/src/sql/drivers/mysql/qsql_mysql.pri
-+++ b/src/sql/drivers/mysql/qsql_mysql.pri
-@@ -4,7 +4,7 @@ SOURCES += $$PWD/qsql_mysql.cpp
- QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL
- LIBS += $$QT_LFLAGS_MYSQL
-
--unix {
-+if (unix|mingw) {
- isEmpty(QT_LFLAGS_MYSQL) {
- !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
- use_libmysqlclient_r:LIBS += -lmysqlclient_r
---
-2.11.0
-