QtBase does not compile on Windows with MSVC 2017

Building 5.11 on Windows 10 x64 with an MSCV 2017 environment fails when trying to build 

qtbase\src\3rdparty\angle\src\compiler\preprocessor\MacroExpander.h

This appears to be due to using the c+17 standard where the MacroExpander has not been updated to conform to c+17.

i:\workspace\qmlbench_qt_5.11_windows\52\qtbase\src\3rdparty\angle\src\compiler\preprocessor\MacroExpander.h(86): error C2039: 'auto_ptr': is not a member of 'std'
C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.14.26428\include\sstream(14): note: see declaration of 'std'
i:\workspace\qmlbench_qt_5.11_windows\52\qtbase\src\3rdparty\angle\src\compiler\preprocessor\MacroExpander.h(86): error C2143: syntax error: missing ';' before '<'
i:\workspace\qmlbench_qt_5.11_windows\52\qtbase\src\3rdparty\angle\src\compiler\preprocessor\MacroExpander.h(86): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
i:\workspace\qmlbench_qt_5.11_windows\52\qtbase\src\3rdparty\angle\src\compiler\preprocessor\MacroExpander.h(86): error C2238: unexpected token(s) preceding ';'

The change that caused this break appears to be Change-Id: I5d0ee9389a794d80983efffd152c95a4d9d8adbc (MSVC: Enable the detection of C++14 and 17 in MSVC 2017 15.7)