Merge remote-tracking branch 'origin/5.5.0' into 5.5

Change-Id: I9c088036dd897e8457ba9e5ab266ad7c5b084bea

Merge remote-tracking branch 'origin/5.5.0' into 5.5
Change-Id: I9c088036dd897e8457ba9e5ab266ad7c5b084bea
04e297e8 · Liang Qi · 3054c1d8 · 66e1ecc2 · 04e297e8 · 04e297e8
Commit 04e297e8 authored 9 years ago by Liang Qi
--- 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
--- 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