[mingw-qt] Exclude the win64 pieces for now

[epienbro]

commit 6b87bfed37de4051045f945bdcc94601cff4e0b4
Author: Erik van Pienbroek <erik at vanpienbroek.nl>
Date:   Sat Mar 10 12:15:26 2012 +0100

    Exclude the win64 pieces for now

 qt-merge-static-and-shared-library-trees.patch |  124 ------------------------
 1 files changed, 0 insertions(+), 124 deletions(-)
---
diff --git a/qt-merge-static-and-shared-library-trees.patch b/qt-merge-static-and-shared-library-trees.patch
index c757293..53f5e6c 100644
--- a/qt-merge-static-and-shared-library-trees.patch
+++ b/qt-merge-static-and-shared-library-trees.patch
@@ -122,127 +122,3 @@
  # Now load the global default_post
  load(default_post)
  
---- usr/x86_64-w64-mingw32/sys-root/mingw/include/QtCore/qconfig.h.orig	2011-12-25 21:03:37.022018831 +0100
-+++ usr/x86_64-w64-mingw32/sys-root/mingw/include/QtCore/qconfig.h	2011-12-25 21:13:50.704976445 +0100
-@@ -26,6 +26,14 @@
- 
- #ifndef QT_BOOTSTRAPPED
- 
-+#if defined(QT_NODLL)
-+#if defined(QT_BUILTIN_GIF_READER) && defined(QT_NO_BUILTIN_GIF_READER)
-+# undef QT_BUILTIN_GIF_READER
-+#elif !defined(QT_BUILTIN_GIF_READER) && !defined(QT_NO_BUILTIN_GIF_READER)
-+# define QT_BUILTIN_GIF_READER 1
-+#endif
-+#endif
-+
- #if defined(QT_NO_ALSA) && defined(QT_ALSA)
- # undef QT_NO_ALSA
- #elif !defined(QT_NO_ALSA) && !defined(QT_ALSA)
-@@ -80,6 +88,7 @@
- # define QT_NO_ICD
- #endif
- 
-+#if !defined(QT_NODLL)
- #if defined(QT_NO_IMAGEFORMAT_JPEG) && defined(QT_IMAGEFORMAT_JPEG)
- # undef QT_NO_IMAGEFORMAT_JPEG
- #elif !defined(QT_NO_IMAGEFORMAT_JPEG) && !defined(QT_IMAGEFORMAT_JPEG)
-@@ -97,6 +106,7 @@
- #elif !defined(QT_NO_IMAGEFORMAT_TIFF) && !defined(QT_IMAGEFORMAT_TIFF)
- # define QT_NO_IMAGEFORMAT_TIFF
- #endif
-+#endif
- 
- #if defined(QT_NO_INOTIFY) && defined(QT_INOTIFY)
- # undef QT_NO_INOTIFY
-@@ -176,6 +186,14 @@
- # define QT_NO_SYSTEMSEMAPHORE
- #endif
- 
-+#if defined(QT_NODLL)
-+#if defined(QT_NO_WEBKIT) && defined(QT_WEBKIT)
-+# undef QT_NO_WEBKIT
-+#elif !defined(QT_NO_WEBKIT) && !defined(QT_WEBKIT)
-+# define QT_NO_WEBKIT
-+#endif
-+#endif
-+
- #if defined(QT_NO_ZLIB) && defined(QT_ZLIB)
- # undef QT_NO_ZLIB
- #elif !defined(QT_NO_ZLIB) && !defined(QT_ZLIB)
---- usr/x86_64-w64-mingw32/sys-root/mingw/include/Qt/qconfig.h.orig	2011-12-25 21:03:13.349289762 +0100
-+++ usr/x86_64-w64-mingw32/sys-root/mingw/include/Qt/qconfig.h	2011-12-25 21:06:37.386579371 +0100
-@@ -26,6 +26,14 @@
- 
- #ifndef QT_BOOTSTRAPPED
- 
-+#if defined(QT_NODLL)
-+#if defined(QT_BUILTIN_GIF_READER) && defined(QT_NO_BUILTIN_GIF_READER)
-+# undef QT_BUILTIN_GIF_READER
-+#elif !defined(QT_BUILTIN_GIF_READER) && !defined(QT_NO_BUILTIN_GIF_READER)
-+# define QT_BUILTIN_GIF_READER 1
-+#endif
-+#endif
-+
- #if defined(QT_NO_ALSA) && defined(QT_ALSA)
- # undef QT_NO_ALSA
- #elif !defined(QT_NO_ALSA) && !defined(QT_ALSA)
-@@ -80,6 +88,7 @@
- # define QT_NO_ICD
- #endif
- 
-+#if !defined(QT_NODLL)
- #if defined(QT_NO_IMAGEFORMAT_JPEG) && defined(QT_IMAGEFORMAT_JPEG)
- # undef QT_NO_IMAGEFORMAT_JPEG
- #elif !defined(QT_NO_IMAGEFORMAT_JPEG) && !defined(QT_IMAGEFORMAT_JPEG)
-@@ -97,6 +106,7 @@
- #elif !defined(QT_NO_IMAGEFORMAT_TIFF) && !defined(QT_IMAGEFORMAT_TIFF)
- # define QT_NO_IMAGEFORMAT_TIFF
- #endif
-+#endif
- 
- #if defined(QT_NO_INOTIFY) && defined(QT_INOTIFY)
- # undef QT_NO_INOTIFY
-@@ -176,6 +186,14 @@
- # define QT_NO_SYSTEMSEMAPHORE
- #endif
- 
-+#if defined(QT_NODLL)
-+#if defined(QT_NO_WEBKIT) && defined(QT_WEBKIT)
-+# undef QT_NO_WEBKIT
-+#elif !defined(QT_NO_WEBKIT) && !defined(QT_WEBKIT)
-+# define QT_NO_WEBKIT
-+#endif
-+#endif
-+
- #if defined(QT_NO_ZLIB) && defined(QT_ZLIB)
- # undef QT_NO_ZLIB
- #elif !defined(QT_NO_ZLIB) && !defined(QT_ZLIB)
---- usr/x86_64-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/qconfig.pri.orig	2011-12-25 21:09:01.616032758 +0100
-+++ usr/x86_64-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/qconfig.pri	2011-12-25 21:12:14.685003350 +0100
-@@ -2,7 +2,11 @@
- CONFIG +=  def_files_disabled exceptions rtti no_mocdepend release stl qt_no_framework
- QT_ARCH = windows
- QT_EDITION = OpenSource
--QT_CONFIG +=  minimal-config small-config medium-config large-config full-config qt3support accessibility opengl reduce_exports ipv6 getaddrinfo system-jpeg system-png png system-tiff no-freetype system-zlib gnu-libiconv dbus dbus-linked openssl xmlpatterns multimedia audio-backend svg script scripttools declarative release
-+contains(CONFIG, static) {
-+   QT_CONFIG +=  minimal-config small-config medium-config large-config full-config qt3support accessibility opengl reduce_exports ipv6 getaddrinfo system-jpeg jpeg mng system-png png gif system-tiff tiff no-freetype system-zlib gnu-libiconv dbus dbus-linked openssl xmlpatterns multimedia audio-backend svg script scripttools declarative release
-+} else {
-+   QT_CONFIG +=  minimal-config small-config medium-config large-config full-config qt3support accessibility opengl reduce_exports ipv6 getaddrinfo system-jpeg system-png png system-tiff no-freetype system-zlib gnu-libiconv dbus dbus-linked openssl xmlpatterns multimedia audio-backend svg script scripttools declarative release
-+}
- 
- #versioning
- QT_VERSION = 4.8.0
---- usr/x86_64-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/features/win32/default_post.prf.orig	2011-12-26 02:29:56.365208473 +0100
-+++ usr/x86_64-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/features/win32/default_post.prf	2011-12-26 02:31:03.650208601 +0100
-@@ -6,6 +6,10 @@
-     }
- }
- 
-+contains(CONFIG, static) {
-+    QMAKE_LFLAGS += -static
-+}
-+
- # Now load the global default_post
- load(default_post)
-