contrib: qt4: fix for mingw-w64

a01f4017 · Rafaël Carré · 4d9f343c · a01f4017 · a01f4017
Commit a01f4017 authored Aug 16, 2013 by Rafaël Carré
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

contrib/src/qt4/rules.mak contrib/src/qt4/rules.mak +1 -0

contrib/src/qt4/win64.patch contrib/src/qt4/win64.patch +11 -0

No files found.
--- a/contrib/src/qt4/rules.mak
+++ b/contrib/src/qt4/rules.mak
@@ -26,6 +26,7 @@ qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
 	$(APPLY) $(SRC)/qt4/styles.patch
 	$(APPLY) $(SRC)/qt4/chroot.patch
 	$(APPLY) $(SRC)/qt4/imageformats.patch
+	$(APPLY) $(SRC)/qt4/win64.patch
 	$(MOVE)

 ifdef HAVE_MACOSX

--- a/contrib/src/qt4/win64.patch
+++ b/contrib/src/qt4/win64.patch
+--- qt4/src/corelib/tools/qsimd.cpp.orig	2013-08-16 21:25:28.069333245 +0200
+++ qt4/src/corelib/tools/qsimd.cpp	2013-08-16 21:25:35.061332951 +0200
+@@ -47,7 +47,7 @@
+ #include <windows.h>
+ #endif
+ 
+-#if defined(Q_OS_WIN64) && !defined(Q_CC_GNU)
+#if defined(Q_OS_WIN64)
+ #include <intrin.h>
+ #endif
+