diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-08 12:16:18 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-08 12:16:18 +0000 |
| commit | ef5b4d2ada000dcbd239b1cedfb38104e3f40d29 (patch) | |
| tree | 2ae0db1d81072b6693b4758ee7f446db2238f4d5 /src/corelib/tools/qalgorithms.h | |
| parent | baebb6aa26799e627bc3be6bf41589cef422bed2 (diff) | |
| parent | 9d50df5511e7919d9e03e5f70c693d36af8204f2 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
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 |