diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-08 09:58:52 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-08 10:01:50 +0100 |
| commit | 9d50df5511e7919d9e03e5f70c693d36af8204f2 (patch) | |
| tree | e1e62848dac6297784646666afaee65cb0867545 /src/corelib/tools/qalgorithms.h | |
| parent | 969bb10eed646313209fcdd9b84605aa98fc88de (diff) | |
| parent | e918605f4238841596a1723a0a8592ec152dc723 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/corelib/tools/qalgorithms.h
Change-Id: Ib8ce4d5d9ecd5b9c166d5b8b44e58f3e4e7283ff
Diffstat (limited to 'src/corelib/tools/qalgorithms.h')
| -rw-r--r-- | src/corelib/tools/qalgorithms.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h index 038f4149c3..38753a6726 100644 --- a/src/corelib/tools/qalgorithms.h +++ b/src/corelib/tools/qalgorithms.h @@ -42,7 +42,7 @@ #include <QtCore/qglobal.h> -#if defined(Q_CC_MSVC) +#if defined(Q_CC_MSVC) && _MSC_VER > 1500 #include <intrin.h> #endif |