From 46159b840cfcfeaea5b1c78d1d0e4fa40d679366 Mon Sep 17 00:00:00 2001
From: Eric Lemanissier <eric.lemanissier@gmail.com>
Date: Wed, 29 Jul 2015 16:11:59 +0200
Subject: [PATCH] fix build with MinGW header version >= 4.0

Commit 66e1ecc2 broke the compilation with MinGW64 4.0 and above.
The work-around for mingw-w64 bug #464 must be applied to
all MinGW versions that are affected.

Change-Id: Ie6665d076dc1e38e459ae3c9cc51202b4a12e736
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
---
 src/activeqt/container/qaxscript.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/activeqt/container/qaxscript.cpp b/src/activeqt/container/qaxscript.cpp
index 81bcb8fa..1d1711b8 100644
--- a/src/activeqt/container/qaxscript.cpp
+++ b/src/activeqt/container/qaxscript.cpp
@@ -41,7 +41,7 @@
 #include "qaxscript.h"
 #include "../shared/qaxutils_p.h"
 
-#if defined(Q_CC_GNU) && __MINGW64_VERSION_MAJOR == 3 && __MINGW64_VERSION_MINOR > 0
+#if defined(Q_CC_GNU) && (__MINGW64_VERSION_MAJOR == 3 && __MINGW64_VERSION_MINOR > 0 || __MINGW64_VERSION_MAJOR >= 4)
 // Workaround for mingw-w64 bug #464
 // See https://sourceforge.net/p/mingw-w64/bugs/464/
 # define _NO_SCRIPT_GUIDS
-- 
GitLab