diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-01-10 14:45:45 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-01-10 14:45:45 +0200 |
| commit | 77c4670a926c461d182db33242edac779f9e44d2 (patch) | |
| tree | 4c61f0ba4e88cff411a0560b4602cf74448dca42 /configure.cmake | |
| parent | 864b08394d1e6d366d7c136ffc50e27adfd08447 (diff) | |
| parent | 824be6fd525f415488c6117db8b03e1a90cabf05 (diff) | |
Merge tag 'v6.5.4-lts' into 6.5.4v6.5.4-lts-lgpl6.5.4
Qt 6.5.4-lts release
Change-Id: Ie240e184ec34fe43acab017cffd6888ab53aefbe
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/configure.cmake b/configure.cmake index c217175b0..83cc0e4c9 100644 --- a/configure.cmake +++ b/configure.cmake @@ -574,19 +574,16 @@ ${xcbErrorMessage}" ) add_check_for_support( MODULES QtWebEngine QtPdf - CONDITION + CONDITION MSVC OR (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL GNU) OR (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL Clang) OR - (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL MSVC) OR - (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL Clang AND - CMAKE_CXX_SIMULATE_ID STREQUAL MSVC) OR (MACOS AND CMAKE_CXX_COMPILER_ID STREQUAL AppleClang) OR (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL AppleClang) OR (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) + if(MSVC) add_check_for_support( MODULES QtWebEngine QtPdf CONDITION NOT MSVC_VERSION LESS 1929 |