9 files changed, 19 insertions, 8 deletions
diff --git a/mkspecs/common/gcc-base-mac.conf b/mkspecs/common/gcc-base-mac.conf
index 6008952537..30bac3ddf4 100644
--- a/mkspecs/common/gcc-base-mac.conf
+++ b/mkspecs/common/gcc-base-mac.conf
@@ -22,3 +22,4 @@ QMAKE_LFLAGS_HEADERPAD     += -headerpad_max_install_names
 QMAKE_LFLAGS_VERSION       += -current_version$${LITERAL_WHITESPACE}
 QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE}
 
+QMAKE_CFLAGS_ARCH_HASWELL = -Xarch_x86_64 $$QMAKE_CFLAGS_ARCH_HASWELL
diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf
index 61a1300860..2d4ca24e96 100644
--- a/mkspecs/common/macx.conf
+++ b/mkspecs/common/macx.conf
@@ -6,13 +6,12 @@ QMAKE_PLATFORM         += macos osx macx
 QMAKE_MAC_SDK           = macosx
 
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
-QMAKE_APPLE_DEVICE_ARCHS = x86_64
 
 # Should be 10.15, but as long as the CI builds with
 # older SDKs we have to keep this.
 QT_MAC_SDK_VERSION_MIN = 10.14
 
-QT_MAC_SDK_VERSION_MAX = 11.0
+QT_MAC_SDK_VERSION_MAX = 12
 
 device.sdk = macosx
 device.target = device
@@ -20,6 +19,8 @@ device.dir_affix = $${device.sdk}
 device.CONFIG = $${device.sdk}
 device.deployment_identifier = $${device.sdk}
 
+CONFIG += only_active_arch
+
 QMAKE_LIBS_VULKAN =
 
 include(mac.conf)
diff --git a/mkspecs/common/msvc-based-version.conf b/mkspecs/common/msvc-based-version.conf
index b53e3b61aa..ba72c3a0ac 100644
--- a/mkspecs/common/msvc-based-version.conf
+++ b/mkspecs/common/msvc-based-version.conf
@@ -34,4 +34,9 @@ greaterThan(QMAKE_MSC_VER, 1919) {
     MSVC_VER            = 16.0
 }
 
+greaterThan(QMAKE_MSC_VER, 1929) {
+    # Visual Studio 2022 (17.0) / Visual C++ 19.30 and up
+    MSVC_VER            = 17.0
+}
+
 !isEmpty(COMPAT_MKSPEC):!$$COMPAT_MKSPEC: CONFIG += $$COMPAT_MKSPEC
diff --git a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf
index 24a92ee147..201c82b9f1 100644
--- a/mkspecs/common/msvc-version.conf
+++ b/mkspecs/common/msvc-version.conf
@@ -128,4 +128,9 @@ greaterThan(QMAKE_MSC_VER, 1927) {
     QMAKE_CFLAGS_C17    = /std:c17
 }
 
+greaterThan(QMAKE_MSC_VER, 1929) {
+    # Visual Studio 2022 (17.0) / Visual C++ 19.30 and up
+    MSVC_VER            = 17.0
+}
+
 !isEmpty(COMPAT_MKSPEC):!$$COMPAT_MKSPEC: CONFIG += $$COMPAT_MKSPEC
diff --git a/mkspecs/common/qcc-base-qnx-aarch64le.conf b/mkspecs/common/qcc-base-qnx-aarch64le.conf
index 914ef33f37..92eff22954 100644
--- a/mkspecs/common/qcc-base-qnx-aarch64le.conf
+++ b/mkspecs/common/qcc-base-qnx-aarch64le.conf
@@ -8,7 +8,7 @@ include(g++-unix.conf)
 include(unix.conf)
 
 QMAKE_CC                = qcc -Vgcc_ntoaarch64le
-QMAKE_CXX               = qcc -Vgcc_ntoaarch64le
+QMAKE_CXX               = q++ -Vgcc_ntoaarch64le
 QNX_CPUDIR              = aarch64le
 
 include(qcc-base-qnx.conf)
diff --git a/mkspecs/common/qcc-base-qnx-armle-v7.conf b/mkspecs/common/qcc-base-qnx-armle-v7.conf
index ad3bb33da4..1225454170 100644
--- a/mkspecs/common/qcc-base-qnx-armle-v7.conf
+++ b/mkspecs/common/qcc-base-qnx-armle-v7.conf
@@ -9,9 +9,10 @@ include(unix.conf)
 include(g++-unix.conf)
 
 QMAKE_CC                = qcc -Vgcc_ntoarmv7le
-QMAKE_CXX               = qcc -Vgcc_ntoarmv7le
+QMAKE_CXX               = q++ -Vgcc_ntoarmv7le
 QNX_CPUDIR              = armle-v7
 QMAKE_CFLAGS           += -mfpu=neon
+QMAKE_CXXFLAGS         += -mfpu=neon
 
 include(qcc-base-qnx.conf)
 
diff --git a/mkspecs/common/qcc-base-qnx-x86-64.conf b/mkspecs/common/qcc-base-qnx-x86-64.conf
index fd04104f71..8e77b5b660 100644
--- a/mkspecs/common/qcc-base-qnx-x86-64.conf
+++ b/mkspecs/common/qcc-base-qnx-x86-64.conf
@@ -8,7 +8,7 @@ include(g++-unix.conf)
 include(unix.conf)
 
 QMAKE_CC                = qcc -Vgcc_ntox86_64
-QMAKE_CXX               = qcc -Vgcc_ntox86_64
+QMAKE_CXX               = q++ -Vgcc_ntox86_64
 QNX_CPUDIR              = x86_64
 
 include(qcc-base-qnx.conf)
diff --git a/mkspecs/common/qcc-base-qnx-x86.conf b/mkspecs/common/qcc-base-qnx-x86.conf
index 37a5d9ce70..23bc84c3c8 100644
--- a/mkspecs/common/qcc-base-qnx-x86.conf
+++ b/mkspecs/common/qcc-base-qnx-x86.conf
@@ -9,7 +9,7 @@ include(unix.conf)
 include(g++-unix.conf)
 
 QMAKE_CC                = qcc -Vgcc_ntox86
-QMAKE_CXX               = qcc -Vgcc_ntox86
+QMAKE_CXX               = q++ -Vgcc_ntox86
 QNX_CPUDIR              = x86
 
 include(qcc-base-qnx.conf)
diff --git a/mkspecs/common/qcc-base.conf b/mkspecs/common/qcc-base.conf
index 24ee29b6b8..b13e3b55bd 100644
--- a/mkspecs/common/qcc-base.conf
+++ b/mkspecs/common/qcc-base.conf
@@ -38,7 +38,6 @@ QMAKE_CFLAGS_SHANI     += -msha
 
 QMAKE_CFLAGS_STACK_PROTECTOR_STRONG = -fstack-protector-strong
 
-QMAKE_CXXFLAGS         += $$QMAKE_CFLAGS -lang-c++
 QMAKE_CXXFLAGS_DEPS    += $$QMAKE_CFLAGS_DEPS
 QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
 QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
@@ -56,4 +55,3 @@ QMAKE_CFLAGS_USE_PRECOMPILE   = -Wc,-include -Wc,${QMAKE_PCH_OUTPUT_BASE}
 QMAKE_CXXFLAGS_PRECOMPILE     = -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
 QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
 
-QMAKE_LFLAGS           += -lang-c++