Commit 46159b84 authored by Eric Lemanissier's avatar Eric Lemanissier
Browse files

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: default avatarOliver Wolff <oliver.wolff@theqtcompany.com>
parent 3477ddc2
Branches
Tags
No related merge requests found
Showing with 1 addition and 1 deletion
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include "qaxscript.h" #include "qaxscript.h"
#include "../shared/qaxutils_p.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 // Workaround for mingw-w64 bug #464
// See https://sourceforge.net/p/mingw-w64/bugs/464/ // See https://sourceforge.net/p/mingw-w64/bugs/464/
# define _NO_SCRIPT_GUIDS # define _NO_SCRIPT_GUIDS
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment