From 66e1ecc28e8bcb0b92ea0212caf611d99a80b0ce Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 22 Jun 2015 16:00:28 +0200 Subject: fix build with MinGW header version > 3.0 Commit 7dffc4f4 broke the compilation with MinGW64 3.1 and above. The work-around for mingw-w64 bug #464 must only applied to MinGW versions that are affected. Task-number: QTBUG-46712 Change-Id: I62bda4db361d15849fa071d0acaee72254d34bd6 Reviewed-by: Oliver Wolff --- 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 01fbcc9..81bcb8f 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) +#if defined(Q_CC_GNU) && __MINGW64_VERSION_MAJOR == 3 && __MINGW64_VERSION_MINOR > 0 // Workaround for mingw-w64 bug #464 // See https://sourceforge.net/p/mingw-w64/bugs/464/ # define _NO_SCRIPT_GUIDS -- cgit v1.2.3