164 lines
5.3 KiB
Diff
164 lines
5.3 KiB
Diff
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 <mabrand@mabrand.nl>
|
|
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 26b89d11b4e51d3aa2aab14dd52216ef8b1c7950 Mon Sep 17 00:00:00 2001
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
Date: Sat, 21 Jun 2014 13:12:49 +0200
|
|
Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific)
|
|
|
|
Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50
|
|
|
|
diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro
|
|
index 32edd6e..a7f2c28 100644
|
|
--- a/config.tests/unix/harfbuzz/harfbuzz.pro
|
|
+++ b/config.tests/unix/harfbuzz/harfbuzz.pro
|
|
@@ -1,3 +1,4 @@
|
|
SOURCES = harfbuzz.cpp
|
|
CONFIG -= qt dylib
|
|
-LIBS += -lharfbuzz
|
|
+CONFIG += link_pkgconfig
|
|
+PKGCONFIG += harfbuzz
|
|
diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri
|
|
index 7443368..c24e684 100644
|
|
--- a/src/3rdparty/harfbuzz_dependency.pri
|
|
+++ b/src/3rdparty/harfbuzz_dependency.pri
|
|
@@ -2,5 +2,6 @@ contains(QT_CONFIG, harfbuzz) {
|
|
INCLUDEPATH += $$PWD/harfbuzz-ng/include
|
|
LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix()
|
|
} else:contains(QT_CONFIG, system-harfbuzz) {
|
|
- LIBS_PRIVATE += -lharfbuzz
|
|
+ CONFIG += link_pkgconfig
|
|
+ PKGCONFIG += harfbuzz
|
|
}
|
|
--
|
|
2.5.0
|
|
|
|
|
|
From fa5ca49b4ffc1911a597b294ef2d4b5ecb983cad Mon Sep 17 00:00:00 2001
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
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 <mabrand@mabrand.nl>
|
|
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 <mabrand@mabrand.nl>
|
|
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
|
|
--
|
|
2.5.0
|
|
|
|
|
|
From 6064564099df17f7cddded8ec0c68d9e57d29ae9 Mon Sep 17 00:00:00 2001
|
|
From: Ray Donnelly <mingw.android@gmail.com>
|
|
Date: Wed, 26 Aug 2015 12:45:43 +0100
|
|
Subject: [PATCH 7/8] cmake: Rearrange STATIC vs INTERFACE targets
|
|
|
|
Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED)
|
|
for header-only modules when building Qt5 statically.
|
|
|
|
Source: https://git.io/vzWJz
|
|
See also: https://github.com/mxe/mxe/issues/1185
|
|
|
|
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
|
index d2358ca..6b1dc95 100644
|
|
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
|
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
|
@@ -222,13 +222,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
|
endif()
|
|
!!ENDIF
|
|
|
|
+!!IF equals(TEMPLATE, aux)
|
|
+ add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED)
|
|
+!!ELSE
|
|
!!IF !isEmpty(CMAKE_STATIC_TYPE)
|
|
add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
|
|
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
|
|
!!ELSE
|
|
-!!IF equals(TEMPLATE, aux)
|
|
- add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED)
|
|
-!!ELSE
|
|
add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
|
|
!!ENDIF
|
|
!!ENDIF
|
|
--
|
|
2.5.0
|
|
|