diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-08-22 10:35:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-22 10:35:12 +0200 |
| commit | 7533156b689c63fa26d66b3e6bacc598cb58456c (patch) | |
| tree | 99a535c86e26284e807cd70e9af9a616b79bceaa /mkspecs | |
| parent | 07eda676e45f6c3c7237581c3f4a9e39695697ab (diff) | |
| parent | 76c328b2b39617310993ce76e65665943b8c111c (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/gui/text/qtextengine.cpp
tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h
Change-Id: Ib9f968edbb0f3387c89bc25e914321d0738bfadc
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/win32-icc/qmake.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index 3cb0d58824..2447c712b1 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -12,6 +12,7 @@ include(../common/msvc-desktop.conf) # modifications to msvc-desktop.conf QMAKE_COMPILER += intel_icl +DEFINES += _ENABLE_EXTENDED_ALIGNED_STORAGE QMAKE_CFLAGS_OPTIMIZE_FULL = -O3 |