summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesus Fernandez <jesus.fernandez@qt.io>2016-11-01 11:35:02 +0100
committerJesus Fernandez <jesus.fernandez@qt.io>2016-11-02 09:49:54 +0000
commitdcedce51a62ae9519d8e85c004c2f93159be8751 (patch)
tree3bdbf8ecda439b49714b272a69af38d4f7a4ef86
parent99cebe717c5d92567a9ee1ca284b7c243ad38c68 (diff)
Include intrin.h header when using MSVC
Fixes the build with MSVC15 Change-Id: I7f22938583775bb3f0767d50cf59a43cab95eede Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--src/corelib/tools/qalgorithms.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h
index ffa3082d5e..b22c5e219c 100644
--- a/src/corelib/tools/qalgorithms.h
+++ b/src/corelib/tools/qalgorithms.h
@@ -36,6 +36,10 @@
#include <QtCore/qglobal.h>
+#if defined(Q_CC_MSVC) && _MSC_VER > 1500
+#include <intrin.h>
+#endif
+
QT_BEGIN_NAMESPACE
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations")