File qt-4.5.2-fix-activeqt-mingw-quirks.patch of Package mingw32-libqt4

Overview Repositories Revisions Requests Users Attributes Meta

File qt-4.5.2-fix-activeqt-mingw-quirks.patch of Package mingw32-libqt4 (Revision 56aa2187a20220581559e78d580a1ec8)

Currently displaying revision 56aa2187a20220581559e78d580a1ec8 , Show latest

--- src/activeqt/container/qaxbase.cpp.orig	2009-06-20 07:01:58.000000000 +0200
+++ src/activeqt/container/qaxbase.cpp	2009-09-10 11:26:59.000000000 +0200
@@ -1356,7 +1356,8 @@
 
 
 // There seams to be a naming problem in mingw headers
-#ifdef Q_CC_GNU
+// However, mingw-w64 got the headers right.
+#if defined(Q_CC_GNU) && ! defined(__MINGW64_VERSION_MAJOR)
 #ifndef COAUTHIDENTITY
 #define COAUTHIDENTITY AUTH_IDENTITY
 #endif
--- src/activeqt/container/qaxwidget.cpp.orig	2009-06-20 07:01:58.000000000 +0200
+++ src/activeqt/container/qaxwidget.cpp	2009-09-10 11:29:58.000000000 +0200
@@ -80,8 +80,9 @@
 // #define QAX_SUPPORT_WINDOWLESS
 // #define QAX_SUPPORT_BORDERSPACE
 
-// missing interface from win32api
-#if defined(Q_CC_GNU)
+// missing interface from win32api, which lacks in traditional mingw
+// headers and has been added to mingw-w64
+#if defined(Q_CC_GNU) && !defined(__MINGW64_VERSION_MAJOR)
 #   if !defined(IOleInPlaceObjectWindowless)
 #       undef INTERFACE
 #       define INTERFACE IOleInPlaceObjectWindowless

Places

File qt-4.5.2-fix-activeqt-mingw-quirks.patch of Package mingw32-libqt4 (Revision 56aa2187a20220581559e78d580a1ec8)

Places