diff --git a/Common/base.pri b/Common/base.pri
index 76da324765..cbd5bda866 100644
--- a/Common/base.pri
+++ b/Common/base.pri
@@ -91,6 +91,10 @@ isEqual(QT_MAJOR_VERSION, 5) {
 
 greaterThan(QT_MAJOR_VERSION, 5) {
 	DEFINES += QT_VERSION_6
+
+	core_windows {
+		QMAKE_CXXFLAGS += /permissive-
+	}
 }
 
 ios {
@@ -108,10 +112,9 @@ win32:contains(QMAKE_TARGET.arch, x86_64): {
 win32:!contains(QMAKE_TARGET.arch, x86_64): {
 	CONFIG += core_win_32
 }
-
-win32-arm64-msvc2017 {
-    CONFIG -= core_win_32
-    CONFIG += core_win_arm64
+win32:contains(QMAKE_TARGET.arch, arm64): {
+	CONFIG -= core_win_32
+	CONFIG += core_win_arm64
 }
 
 linux-clang-libc++ {