diff options
author | Tarja Sundqvist <[email protected]> | 2024-10-07 17:38:05 +0300 |
---|---|---|
committer | Tarja Sundqvist <[email protected]> | 2024-10-07 17:44:32 +0300 |
commit | 183d0101f41fd5a1007708a9416d1f12db31c1cb (patch) | |
tree | 969a5e91aef3b4c6805331e56c24fa6be8738f6b /configure.cmake | |
parent | 17e9f29577ea6573c7c348083ff510ee60c7e8cc (diff) | |
parent | 13381ca9e80578d038835c8a4dc609d75dfdec4c (diff) |
Merge tag 'v6.2.10-lts' into tqtc/lts-6.2-opensourcev6.2.10-lts-lgpl6.2.10
Qt 6.2.10-lts release
Conflicts solved:
CHROMIUM_VERSION
dependencies.yaml
src/core/web_engine_context.cpp
Change-Id: Ia54316ba0df3488d8e13c8f14fead1d90099519b
Diffstat (limited to 'configure.cmake')
-rw-r--r-- | configure.cmake | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/configure.cmake b/configure.cmake index 835017d5f..579125d04 100644 --- a/configure.cmake +++ b/configure.cmake @@ -574,11 +574,6 @@ ${xcbErrorMessage}" ) add_check_for_support( MODULES QtWebEngine QtPdf - CONDITION NOT WIN32 OR TEST_winversion - MESSAGE "Build requires Visual Studio 2019 or higher." -) -add_check_for_support( - MODULES QtWebEngine QtPdf CONDITION (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL GNU) OR (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL Clang) OR @@ -590,7 +585,6 @@ add_check_for_support( (ANDROID AND CMAKE_CXX_COMPILER_ID STREQUAL Clang) MESSAGE "${CMAKE_CXX_COMPILER_ID} compiler is not supported." ) - if(WIN32) if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC) add_check_for_support( @@ -609,6 +603,11 @@ if(WIN32) MESSAGE "Build requires Windows 10 SDK at least version 10.0.20348.0" ) endif() +add_check_for_support( + MODULES QtWebEngine QtPdf + CONDITION NOT MSVC OR TEST_winversion + MESSAGE "Build requires Visual Studio 2019 or higher." +) #### Summary |