diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:26:34 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:26:34 +0200 |
| commit | 7b25c625ea50a58edb1d6d5c79ea6dcb00cfc12b (patch) | |
| tree | 6e707041a258ed3a0c34cd52857b02d237e9a0eb | |
| parent | 2f0de14dc8fa529ef61c8599ec927e440e25b467 (diff) | |
| parent | 46159b840cfcfeaea5b1c78d1d0e4fa40d679366 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Ie63185f66c060582a11ee75eca215d6536283e86
| -rw-r--r-- | src/activeqt/container/qaxscript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/container/qaxscript.cpp b/src/activeqt/container/qaxscript.cpp index 81bcb8f..1d1711b 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 |