This file is part of MXE. See index.html for further information. Contains ad hoc patches for cross building. From 54b168c305f54e60de0e32501b166faa7f5913e0 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 23:35:08 +0200 Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE specific) Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4 diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri index 39280de..e152b0d 100644 --- a/src/3rdparty/freetype_dependency.pri +++ b/src/3rdparty/freetype_dependency.pri @@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) { } else:contains(QT_CONFIG, system-freetype) { # pull in the proper freetype2 include directory include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) + win32:shared:LIBS_PRIVATE += -lfreetype } -- 2.5.0 From fa5ca49b4ffc1911a597b294ef2d4b5ecb983cad Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 8 Dec 2014 14:15:12 +0100 Subject: [PATCH 3/8] fix oci config test on windows Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922 diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro index 3ffda1d..39b6f3759 100644 --- a/config.tests/unix/oci/oci.pro +++ b/config.tests/unix/oci/oci.pro @@ -1,3 +1,3 @@ SOURCES = oci.cpp CONFIG -= qt dylib -LIBS += -lclntsh +!win32:LIBS += -lclntsh -- 2.5.0 From 7fd641a032c7b4ce1b14d7ca02da646b0a0c34d5 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 13:24:56 +0200 Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa diff --git a/configure b/configure index 7651e29..4a4b478 100755 --- a/configure +++ b/configure @@ -4575,7 +4575,7 @@ fi [ "$XPLATFORM_ANDROID" = "yes" ] && QMakeVar add styles "android" # check IPC support -if ! compileTest unix/ipc_sysv "ipc_sysv" ; then +if [ "$XPLATFORM_MINGW" = "no" ] && ! compileTest unix/ipc_sysv "ipc_sysv" ; then # SYSV IPC is not supported - check POSIX IPC if compileTest unix/ipc_posix "ipc_posix" ; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC" -- 2.5.0 From 959d3a71bced8c00967a16f23c6f9305e56fafcd Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 6 Oct 2015 09:53:20 +0200 Subject: [PATCH 5/8] fix building mysql driver under mingw Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9 diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri index 3cfb614..8b7063f 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