blob: 76d91772e7da5e491e96c3d867748c8fc7019ade (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
This file is part of MXE.
See index.html for further information.
From 6b7bd2f322cf0ff02c1954c7947216af829d4b15 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 21 May 2014 08:59:53 +0200
Subject: [PATCH 1/2] Revert "idc is a host tool"
This reverts commit a52db1a707f84eae74ce1cc3d1058f026e81ac13.
Conflicts:
src/tools/idc/idc.pro
diff --git a/src/tools/idc/idc.pro b/src/tools/idc/idc.pro
index 1898ed5..524ee2e 100644
--- a/src/tools/idc/idc.pro
+++ b/src/tools/idc/idc.pro
@@ -1,4 +1,3 @@
-option(host_build)
CONFIG += force_bootstrap
SOURCES = main.cpp
--
2.1.4
From 31d513a1814e600433a213931c79fb4f9f875122 Mon Sep 17 00:00:00 2001
From: Eric Lemanissier <eric.lemanissier@gmail.com>
Date: Wed, 29 Jul 2015 16:11:59 +0200
Subject: [PATCH 2/2] fix build with MinGW header version >= 4.0
Commit 66e1ecc2 broke the compilation with MinGW64 4.0 and above.
The work-around for mingw-w64 bug #464 must be applied to
all MinGW versions that are affected.
Change-Id: Ie6665d076dc1e38e459ae3c9cc51202b4a12e736
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
(cherry picked from commit 46159b840cfcfeaea5b1c78d1d0e4fa40d679366)
diff --git a/src/activeqt/container/qaxscript.cpp b/src/activeqt/container/qaxscript.cpp
index 81bcb8f..1d1711b 100644
--- a/src/activeqt/container/qaxscript.cpp
+++ b/src/activeqt/container/qaxscript.cpp
@@ -41,7 +41,7 @@
#include "qaxscript.h"
#include "../shared/qaxutils_p.h"
-#if defined(Q_CC_GNU) && __MINGW64_VERSION_MAJOR == 3 && __MINGW64_VERSION_MINOR > 0
+#if defined(Q_CC_GNU) && (__MINGW64_VERSION_MAJOR == 3 && __MINGW64_VERSION_MINOR > 0 || __MINGW64_VERSION_MAJOR >= 4)
// Workaround for mingw-w64 bug #464
// See https://sourceforge.net/p/mingw-w64/bugs/464/
# define _NO_SCRIPT_GUIDS
--
2.1.4
|
