|
4222
|
1 This file is part of MXE. |
|
|
2 See index.html for further information. |
|
|
3 |
|
|
4 Contains ad hoc patches for cross building. |
|
|
5 |
|
|
6 From 9e13228f4af09b93f6cd123635784e4988694ac2 Mon Sep 17 00:00:00 2001 |
|
|
7 From: Mark Brand <mabrand@mabrand.nl> |
|
|
8 Date: Thu, 6 Aug 2015 23:35:08 +0200 |
|
|
9 Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE |
|
|
10 specific) |
|
|
11 |
|
|
12 Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4 |
|
|
13 |
|
|
14 diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri |
|
|
15 index 39280de..e152b0d 100644 |
|
|
16 --- a/src/3rdparty/freetype_dependency.pri |
|
|
17 +++ b/src/3rdparty/freetype_dependency.pri |
|
|
18 @@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) { |
|
|
19 } else:contains(QT_CONFIG, system-freetype) { |
|
|
20 # pull in the proper freetype2 include directory |
|
|
21 include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) |
|
|
22 + win32:shared:LIBS_PRIVATE += -lfreetype |
|
|
23 } |
|
|
24 -- |
|
|
25 2.7.4 |
|
|
26 |
|
|
27 |
|
|
28 From 2d7638835de6b5f16cf64e6cf4eede1f8a9ccedb Mon Sep 17 00:00:00 2001 |
|
|
29 From: Mark Brand <mabrand@mabrand.nl> |
|
|
30 Date: Sat, 21 Jun 2014 13:12:49 +0200 |
|
|
31 Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific) |
|
|
32 |
|
|
33 Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50 |
|
|
34 |
|
|
35 diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro |
|
|
36 index 32edd6e..a7f2c28 100644 |
|
|
37 --- a/config.tests/unix/harfbuzz/harfbuzz.pro |
|
|
38 +++ b/config.tests/unix/harfbuzz/harfbuzz.pro |
|
|
39 @@ -1,3 +1,4 @@ |
|
|
40 SOURCES = harfbuzz.cpp |
|
|
41 CONFIG -= qt dylib |
|
|
42 -LIBS += -lharfbuzz |
|
|
43 +CONFIG += link_pkgconfig |
|
|
44 +PKGCONFIG += harfbuzz |
|
|
45 diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri |
|
|
46 index 7443368..c24e684 100644 |
|
|
47 --- a/src/3rdparty/harfbuzz_dependency.pri |
|
|
48 +++ b/src/3rdparty/harfbuzz_dependency.pri |
|
|
49 @@ -2,5 +2,6 @@ contains(QT_CONFIG, harfbuzz) { |
|
|
50 INCLUDEPATH += $$PWD/harfbuzz-ng/include |
|
|
51 LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix() |
|
|
52 } else:contains(QT_CONFIG, system-harfbuzz) { |
|
|
53 - LIBS_PRIVATE += -lharfbuzz |
|
|
54 + CONFIG += link_pkgconfig |
|
|
55 + PKGCONFIG += harfbuzz |
|
|
56 } |
|
|
57 -- |
|
|
58 2.7.4 |
|
|
59 |
|
|
60 |
|
|
61 From 172b7bf1f113b1ea443a64ad4f9a2ecda6ee06e2 Mon Sep 17 00:00:00 2001 |
|
|
62 From: Mark Brand <mabrand@mabrand.nl> |
|
|
63 Date: Mon, 8 Dec 2014 14:15:12 +0100 |
|
|
64 Subject: [PATCH 3/8] fix oci config test on windows |
|
|
65 |
|
|
66 Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922 |
|
|
67 |
|
|
68 diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro |
|
|
69 index 3ffda1d..39b6f3759 100644 |
|
|
70 --- a/config.tests/unix/oci/oci.pro |
|
|
71 +++ b/config.tests/unix/oci/oci.pro |
|
|
72 @@ -1,3 +1,3 @@ |
|
|
73 SOURCES = oci.cpp |
|
|
74 CONFIG -= qt dylib |
|
|
75 -LIBS += -lclntsh |
|
|
76 +!win32:LIBS += -lclntsh |
|
|
77 -- |
|
|
78 2.7.4 |
|
|
79 |
|
|
80 |
|
|
81 From 7756e4e14ae5b33fea04416bd4f238ca1dfe4d30 Mon Sep 17 00:00:00 2001 |
|
|
82 From: Mark Brand <mabrand@mabrand.nl> |
|
|
83 Date: Thu, 6 Aug 2015 13:24:56 +0200 |
|
|
84 Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows |
|
|
85 |
|
|
86 Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa |
|
|
87 |
|
|
88 diff --git a/configure b/configure |
|
|
89 index 43b55f0..de2c3ec 100755 |
|
|
90 --- a/configure |
|
|
91 +++ b/configure |
|
|
92 @@ -4656,7 +4656,7 @@ fi |
|
|
93 [ "$XPLATFORM_ANDROID" = "yes" ] && QMakeVar add styles "android" |
|
|
94 |
|
|
95 # check IPC support |
|
|
96 -if ! compileTest unix/ipc_sysv "ipc_sysv" ; then |
|
|
97 +if [ "$XPLATFORM_MINGW" = "no" ] && ! compileTest unix/ipc_sysv "ipc_sysv" ; then |
|
|
98 # SYSV IPC is not supported - check POSIX IPC |
|
|
99 if compileTest unix/ipc_posix "ipc_posix" ; then |
|
|
100 QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC" |
|
|
101 -- |
|
|
102 2.7.4 |
|
|
103 |
|
|
104 |
|
|
105 From 236aecbd657f06d0b18bc25b93d5390ac644daaf Mon Sep 17 00:00:00 2001 |
|
|
106 From: Ray Donnelly <mingw.android@gmail.com> |
|
|
107 Date: Wed, 26 Aug 2015 12:45:43 +0100 |
|
|
108 Subject: [PATCH 6/8] cmake: Rearrange STATIC vs INTERFACE targets |
|
|
109 |
|
|
110 Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) |
|
|
111 for header-only modules when building Qt5 statically. |
|
|
112 |
|
|
113 Source: https://git.io/vzWJz |
|
|
114 See also: https://github.com/mxe/mxe/issues/1185 |
|
|
115 |
|
|
116 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in |
|
|
117 index d2358ca..6b1dc95 100644 |
|
|
118 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in |
|
|
119 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in |
|
|
120 @@ -222,13 +222,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) |
|
|
121 endif() |
|
|
122 !!ENDIF |
|
|
123 |
|
|
124 +!!IF equals(TEMPLATE, aux) |
|
|
125 + add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) |
|
|
126 +!!ELSE |
|
|
127 !!IF !isEmpty(CMAKE_STATIC_TYPE) |
|
|
128 add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) |
|
|
129 set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") |
|
|
130 !!ELSE |
|
|
131 -!!IF equals(TEMPLATE, aux) |
|
|
132 - add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) |
|
|
133 -!!ELSE |
|
|
134 add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) |
|
|
135 !!ENDIF |
|
|
136 !!ENDIF |
|
|
137 -- |
|
|
138 2.7.4 |
|
|
139 |
|
|
140 |
|
|
141 From 0d1b11391894345be8a1fe084afb3799fc828488 Mon Sep 17 00:00:00 2001 |
|
|
142 From: Thiago Macieira <thiago.macieira@intel.com> |
|
|
143 Date: Wed, 18 May 2016 14:40:20 -0700 |
|
|
144 Subject: [PATCH 7/8] Fix linking of the minimal platform plugin on OS X |
|
|
145 |
|
|
146 platformsupport/fontdatabases/fontdatabases.pri disables all font |
|
|
147 databases except CoreText on OS X, so this is required for |
|
|
148 linking. Otherwise, we get undefined reference linker errors: |
|
|
149 |
|
|
150 Undefined symbols for architecture x86_64: |
|
|
151 "vtable for QBasicFontDatabase", referenced from: |
|
|
152 QMinimalIntegration::fontDatabase() const in |
|
|
153 qminimalintegration.o |
|
|
154 |
|
|
155 Change-Id: I31298e973803b4d6eedbf61607056114d1556584 |
|
|
156 Reviewed-by: Jake Petroules <jake.petroules@qt.io> |
|
|
157 (cherry picked from commit 16864c42d6bc0ee6b3e3fa03123ef5884557ceea) |
|
|
158 |
|
|
159 diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro |
|
|
160 index 0d31d66..bd6f2d8 100644 |
|
|
161 --- a/src/plugins/platforms/minimal/minimal.pro |
|
|
162 +++ b/src/plugins/platforms/minimal/minimal.pro |
|
|
163 @@ -11,6 +11,7 @@ HEADERS = qminimalintegration.h \ |
|
|
164 OTHER_FILES += minimal.json |
|
|
165 |
|
|
166 CONFIG += qpa/genericunixfontdatabase |
|
|
167 +darwin: DEFINES += QT_NO_FONTCONFIG |
|
|
168 |
|
|
169 PLUGIN_TYPE = platforms |
|
|
170 PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin |
|
|
171 -- |
|
|
172 2.7.4 |
|
|
173 |
|
|
174 |
|
|
175 From f504f5805be3cc27e19632e15b29eaaaac0e92e8 Mon Sep 17 00:00:00 2001 |
|
|
176 From: Boris Pek <tehnick-8@yandex.ru> |
|
|
177 Date: Sun, 19 Jun 2016 03:15:43 +0300 |
|
|
178 Subject: [PATCH 8/8] Fix build of the minimal platform plugin for MS Windows |
|
|
179 |
|
|
180 when qtbase is configured with -fontconfig and -system-freetype. |
|
|
181 |
|
|
182 This fix is necessary after 060e0f6628fd185994911307c59f5355acaaf18f. |
|
|
183 Used the same approach as in 16864c42d6bc0ee6b3e3fa03123ef5884557ceea. |
|
|
184 |
|
|
185 Change-Id: Idece0dc11d89e38266c95de1769be751c06324ef |
|
|
186 (cherry picked from commit 02d2969fafe5088bb1c80eb58b2736df447326cd) |
|
|
187 |
|
|
188 diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro |
|
|
189 index bd6f2d8..4b63461 100644 |
|
|
190 --- a/src/plugins/platforms/minimal/minimal.pro |
|
|
191 +++ b/src/plugins/platforms/minimal/minimal.pro |
|
|
192 @@ -12,6 +12,7 @@ OTHER_FILES += minimal.json |
|
|
193 |
|
|
194 CONFIG += qpa/genericunixfontdatabase |
|
|
195 darwin: DEFINES += QT_NO_FONTCONFIG |
|
|
196 +win32: DEFINES += QT_NO_FONTCONFIG |
|
|
197 |
|
|
198 PLUGIN_TYPE = platforms |
|
|
199 PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin |
|
|
200 -- |
|
|
201 2.7.4 |
|
|
202 |
|
|
203 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
|
204 From: Tony Theodore <tonyt@logyst.com> |
|
|
205 Date: Sat, 16 Jul 2016 20:31:07 +1000 |
|
|
206 Subject: [PATCH] Fix pkgconfig file and library naming |
|
|
207 |
|
|
208 See: https://codereview.qt-project.org/#/c/165394/ |
|
|
209 https://bugreports.qt.io/browse/QTBUG-30898 |
|
|
210 |
|
|
211 Currently, *.pc files are generated with debug suffix `d` in `-release` |
|
|
212 mode and without the suffix in `-debug` or `-debug-and-release`. This |
|
|
213 can be worked around by `CONIFG-=debug_and_release`, however, a more |
|
|
214 predictable and consistent naming approach would be preferable. |
|
|
215 |
|
|
216 This change mimics the *.prl file and lib conventions: |
|
|
217 |
|
|
218 -release: creates normal *.pc files and lib names |
|
|
219 -release -force-debug-info: normal as above |
|
|
220 -debug: creates *d.pc and *d lib names |
|
|
221 -debug-and-release: creates both |
|
|
222 -default: creates both (default link: debug) |
|
|
223 |
|
|
224 and should be unsurprising to users of `pkg-config`. At very least, |
|
|
225 it's deterministic and easily incorporated into build systems. |
|
|
226 |
|
|
227 Task-number: 30898 |
|
|
228 Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644 |
|
|
229 |
|
|
230 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf |
|
|
231 index 1111111..2222222 100644 |
|
|
232 --- a/mkspecs/features/qt_module.prf |
|
|
233 +++ b/mkspecs/features/qt_module.prf |
|
|
234 @@ -244,6 +244,10 @@ load(qt_installs) |
|
|
235 |
|
|
236 load(qt_targets) |
|
|
237 |
|
|
238 +# Set TARGET towards the end but before pkgconfig setup to keep naming |
|
|
239 +# conventions consistent with *prl files |
|
|
240 +TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) |
|
|
241 + |
|
|
242 # this builds on top of qt_common |
|
|
243 !internal_module:!lib_bundle:if(unix|mingw) { |
|
|
244 CONFIG += create_pc |
|
|
245 @@ -254,12 +258,12 @@ load(qt_targets) |
|
|
246 QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw] |
|
|
247 QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] |
|
|
248 QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME |
|
|
249 - QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ") |
|
|
250 - QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION) |
|
|
251 + QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt$$QT_MAJOR_VERSION ") |
|
|
252 + QMAKE_PKGCONFIG_FILE = $$TARGET |
|
|
253 for(i, MODULE_DEPENDS): \ |
|
|
254 - QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$eval(QT.$${i}.MAJOR_VERSION)) |
|
|
255 + QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$eval(QT.$${i}.MAJOR_VERSION))$$qtPlatformTargetSuffix() |
|
|
256 isEmpty(QMAKE_PKGCONFIG_DESCRIPTION): \ |
|
|
257 - QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module |
|
|
258 + QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt ") module |
|
|
259 pclib_replace.match = $$lib_replace.match |
|
|
260 !isEmpty(lib_replace.replace): \ |
|
|
261 pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR |
|
|
262 @@ -293,5 +297,3 @@ win32 { |
|
|
263 # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API |
|
|
264 DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x050000 |
|
|
265 } |
|
|
266 - |
|
|
267 -TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) # Do this towards the end |
