diff options
| author | Thomas Miller <thomaslmiller91@gmail.com> | 2018-07-24 14:52:04 -0700 |
|---|---|---|
| committer | Thomas Miller <thomaslmiller91@gmail.com> | 2018-07-30 18:29:10 +0000 |
| commit | 0ef66e98ccf4946a0e4513ab5fc157df0f0aca4e (patch) | |
| tree | 2f18b163d4f75a8847cbc4a2e2860551a1d71a45 /mkspecs | |
| parent | ce4407c32749e9d22314c09aa205691dbad2a335 (diff) | |
Fix qtbase build for MSVC 2017 15.8
Fixed breaks caused by MSVC 2017 15.8 fixing std::aligned_storage.
Change-Id: I5adea18c184e34bbdc3bd294d034b97383ef08a3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/msvc-version.conf | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf index 3fb55c9d81..5805383a04 100644 --- a/mkspecs/common/msvc-version.conf +++ b/mkspecs/common/msvc-version.conf @@ -110,6 +110,12 @@ greaterThan(QMAKE_MSC_VER, 1909) { QMAKE_CXXFLAGS_CXX14 = -std:c++14 QMAKE_CXXFLAGS_CXX1Z = -std:c++17 } + + # MSVC 2017 15.8+ fixed std::aligned_storage but compilation fails without + # this flag since the fix breaks binary compatibility. + greaterThan(QMAKE_MSC_VER, 1914) { + DEFINES += _ENABLE_EXTENDED_ALIGNED_STORAGE + } } greaterThan(QMAKE_MSC_VER, 1910) { |