diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:03:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:03:18 +0200 |
| commit | 04e297e85628a01683127dfc240e6dd87b45dea2 (patch) | |
| tree | ee6db8e80fa532a4cbf48037882ed2d59cf827f1 | |
| parent | 3054c1d870eb41e3e7e922806f8f1771cb651819 (diff) | |
| parent | 66e1ecc28e8bcb0b92ea0212caf611d99a80b0ce (diff) | |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Change-Id: I9c088036dd897e8457ba9e5ab266ad7c5b084bea
| -rw-r--r-- | qtactiveqt.pro | 2 | ||||
| -rw-r--r-- | src/activeqt/container/qaxscript.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qtactiveqt.pro b/qtactiveqt.pro index 83d709a..039aaad 100644 --- a/qtactiveqt.pro +++ b/qtactiveqt.pro @@ -3,5 +3,5 @@ load(qt_parts) !win32|winrt|wince { message("ActiveQt is a Windows Desktop-only module. Will just generate a docs target.") + SUBDIRS = src } -SUBDIRS = src 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 |