diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2014-05-20 21:53:39 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2014-05-21 09:59:00 (GMT) |
| commit | ebc859ef6c714792c383b3be39e809e7e04bb017 (patch) | |
| tree | 6edfa52c181c3bf397d059179576af09cde7994b /src/qtactiveqt-1.patch | |
| parent | f341eb3780d1e04a97e352f7d959e7a8d6a1c79d (diff) | |
| download | mxe-ebc859ef6c714792c383b3be39e809e7e04bb017.zip mxe-ebc859ef6c714792c383b3be39e809e7e04bb017.tar.gz mxe-ebc859ef6c714792c383b3be39e809e7e04bb017.tar.bz2 | |
update qt5 modules
Diffstat (limited to 'src/qtactiveqt-1.patch')
| -rw-r--r-- | src/qtactiveqt-1.patch | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/qtactiveqt-1.patch b/src/qtactiveqt-1.patch index 08e6b6e..38d24aa 100644 --- a/src/qtactiveqt-1.patch +++ b/src/qtactiveqt-1.patch @@ -1,23 +1,25 @@ This file is part of MXE. See index.html for further information. -From 7779365c9bd2741e28f16f99e2df19e4597e1c69 Mon Sep 17 00:00:00 2001 +From 470bf2340d0c275d9e02492f11e4103e081d1f93 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> -Date: Sat, 18 May 2013 15:28:33 +0200 +Date: Wed, 21 May 2014 08:59:53 +0200 Subject: [PATCH] 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 b9d8dee..05a592a 100644 +index 1898ed5..524ee2e 100644 --- a/src/tools/idc/idc.pro +++ b/src/tools/idc/idc.pro -@@ -1,5 +1,3 @@ +@@ -1,4 +1,3 @@ -option(host_build) -- - QT = core - + CONFIG += force_bootstrap SOURCES = main.cpp + -- 1.8.4.5 |