1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MSVC: Enable standard-conformance mode by default

Browse Source 
That's not the same as -Za.

Change-Id: Ica9894dc9b5e48278fd4fffd14bb316b687abffe
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Thiago Macieira 2017-05-03 13:07:18 -07:00
parent e4eaa62943
commit b7d76e533c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mkspecs/common/msvc-version.conf
View File

@ -81,6 +81,7 @@ greaterThan(QMAKE_MSC_VER, 1909) {
MSVC_VER = 15.0 MSVC_VER = 15.0
COMPAT_MKSPEC = win32-msvc2017 COMPAT_MKSPEC = win32-msvc2017
QMAKE_CXXFLAGS += -Zc:referenceBinding QMAKE_CXXFLAGS += -Zc:referenceBinding
QMAKE_CXXFLAGS_STRICTCXX = -permissive-
} }
greaterThan(QMAKE_MSC_VER, 1910) { greaterThan(QMAKE_MSC_VER, 1910) {

8
mkspecs/features/default_post.prf
View File

@ -124,8 +124,12 @@ c++11|c++14|c++1z {
cxxstd = CXX11 cxxstd = CXX11
} }
# Check if we should disable the GNU extensions or not # Check if we should disable compiler extensions or not
!strict_c++:!isEmpty(QMAKE_CXXFLAGS_GNU$$cxxstd): cxxstd = GNU$$cxxstd isEmpty(QMAKE_CXXFLAGS_GNU$$cxxstd) {
strict_c++: QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_STRICTCXX
} else {
!strict_c++: cxxstd = GNU$$cxxstd
}
QMAKE_CXXFLAGS += $$eval(QMAKE_CXXFLAGS_$$cxxstd) QMAKE_CXXFLAGS += $$eval(QMAKE_CXXFLAGS_$$cxxstd)
QMAKE_LFLAGS += $$eval(QMAKE_LFLAGS_$$cxxstd) QMAKE_LFLAGS += $$eval(QMAKE_LFLAGS_$$cxxstd)