From db06745fe2f0e705826f37d11e9d021abbbbf37d Mon Sep 17 00:00:00 2001
From: Matt Hoosier <matt.hoosier@garmin.com>
Date: Tue, 1 Dec 2015 18:02:33 -0600
Subject: [PATCH] Fix overflow-checking additions and multiplication on MinGW

Intrinsics headers are associated with compilers, not OS's. This
change fixes a broken MinGW build triggered by
29bc68cf169b8cf87d306a1c72e12eb9b6fbfce7.

Change-Id: Ib9e4ea3e25bf49d38a754a246b9433bc078bbb18
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/global/qnumeric_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h
index e5f9d8e13e..b18d521d05 100644
--- a/src/corelib/global/qnumeric_p.h
+++ b/src/corelib/global/qnumeric_p.h
@@ -50,7 +50,7 @@
 
 #include <limits>
 
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if defined(Q_CC_MSVC) && !defined(Q_OS_WINCE)
 #  include <intrin.h>
 #elif defined(Q_CC_INTEL)
 #  include <immintrin.h>    // for _addcarry_u<nn>