diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-08-04 11:48:08 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-08-04 14:42:56 +0000 |
commit | aacf93e14a6f102b79f4506b334ae8a4b014f0c2 (patch) | |
tree | 2be2aaa31d401af2ed3f2cbf783bab129cdd29ba | |
parent | 9b70c1825038c2e69eecc774bcdd884adc240cec (diff) |
Support MSVC 2019
Pick-to: dev
Fixes: QTBUG-115713
Change-Id: I45721005d1953c830ab95039827910b06800db54
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
-rw-r--r-- | configure.cmake | 8 | ||||
m--------- | src/3rdparty | 0 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.cmake b/configure.cmake index 688c68d4e..8f30b3446 100644 --- a/configure.cmake +++ b/configure.cmake @@ -201,7 +201,7 @@ qt_config_compile_test(winversion LABEL "winversion" CODE " -#if !defined(__clang__) && _MSC_VER < 1934 +#if !defined(__clang__) && _MSC_VER < 1922 #error unsupported Visual Studio version #endif int main(void){ @@ -609,8 +609,8 @@ if(WIN32) if(MSVC) add_check_for_support( MODULES QtWebEngine QtPdf - CONDITION NOT MSVC_VERSION LESS 1936 - MESSAGE "VS compiler version must be at least 14.36" + CONDITION NOT MSVC_VERSION LESS 1922 + MESSAGE "VS compiler version must be at least 14.22" ) endif() set(windowsSdkVersion $ENV{WindowsSDKVersion}) @@ -626,7 +626,7 @@ endif() add_check_for_support( MODULES QtWebEngine QtPdf CONDITION NOT MSVC OR TEST_winversion - MESSAGE "Build requires Visual Studio 2022 or higher." + MESSAGE "Build requires Visual Studio 2019 or higher." ) #### Summary diff --git a/src/3rdparty b/src/3rdparty -Subproject b5888eec6fcc052c4cda569599f5096bd6f5d66 +Subproject 96cc1f936fc89d474f9140e8dd7e682482f2300 |