1 files changed, 0 insertions, 88 deletions
diff --git a/src/qtbase-1-cherrypicks.patch b/src/qtbase-1-cherrypicks.patch
deleted file mode 100644
index 5b7c548..0000000
--- a/src/qtbase-1-cherrypicks.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-From 0fea27fabd57150874b80deacdf9f12c4a1d5172 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Tue, 26 Feb 2013 13:23:33 +0100
-Subject: [PATCH 1/3] use pkg-config for freetype
-
-Change-Id: Id2f78ed9dbdcacd570eb25982cbd700d0437542a
-
-diff --git a/src/platformsupport/fontdatabases/basic/basic.pri b/src/platformsupport/fontdatabases/basic/basic.pri
-index 88be809..8fc19d2 100644
---- a/src/platformsupport/fontdatabases/basic/basic.pri
-+++ b/src/platformsupport/fontdatabases/basic/basic.pri
-@@ -82,5 +82,7 @@ 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)
-+    CONFIG += link_pkgconfig
-+    PKGCONFIG += freetype2
- }
- 
--- 
-1.8.1.4
-
-
-From 7d17dc925a6d038be6689f2bd01dfe6a5af2f91d Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Sat, 22 Dec 2012 17:45:34 +0100
-Subject: [PATCH 2/3] WIP: qmake writeFile(): work around concurrent
- QDir::mkpath() failure
-
-This actually happened when building qtimageformats with make -j4.
-Failure in mkspecs/features/qt_plugin.prf:
-    write_file($$MODULE_PRI, MODULE_PRI_CONT)|error("Aborting.") with make -j4.
-
-Change-Id: Ibc685f613d721e178e6aff408905d77b0ce1740a
-
-diff --git a/qmake/library/qmakebuiltins.cpp b/qmake/library/qmakebuiltins.cpp
-index be0d8ea..6306235 100644
---- a/qmake/library/qmakebuiltins.cpp
-+++ b/qmake/library/qmakebuiltins.cpp
-@@ -310,9 +310,17 @@ QMakeEvaluator::writeFile(const QString &ctx, const QString &fn, QIODevice::Open
- {
-     QFileInfo qfi(fn);
-     if (!QDir::current().mkpath(qfi.path())) {
--        evalError(fL1S("Cannot create %1directory %2.")
--                  .arg(ctx, QDir::toNativeSeparators(qfi.path())));
--        return ReturnFalse;
-+        // could have failed due to concurrent mkpath attempt
-+#ifdef Q_OS_WIN
-+       Sleep(1000);
-+#else
-+       sleep(1);
-+#endif
-+        if (!qfi.dir().exists()) {
-+            evalError(fL1S("Cannot create %1directory %2.")
-+                      .arg(ctx, QDir::toNativeSeparators(qfi.path())));
-+            return ReturnFalse;
-+        }
-     }
-     QString errStr;
-     if (!doWriteFile(qfi.filePath(), mode, contents, &errStr)) {
--- 
-1.8.1.4
-
-
-From f758fbacac30a7c4b5e44fb6d5cbe16383d5d269 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Sat, 18 May 2013 23:07:46 +0200
-Subject: [PATCH 3/3] use pkgconfig for icu detection (MXE specific)
-
-Change-Id: I874171361fec812cb5a5a56e4d8d90a630be3bf3
-
-diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro
-index 8e58334..1d66c16 100644
---- a/config.tests/unix/icu/icu.pro
-+++ b/config.tests/unix/icu/icu.pro
-@@ -1,4 +1,4 @@
- SOURCES = icu.cpp
- CONFIG -= qt dylib app_bundle
--unix:LIBS += -licuuc -licui18n
--win32:LIBS += -licuin
-+CONFIG += link_pkgconfig
-+PKGCONFIG += icu-i18n
--- 
-1.8.1.4
-