diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-06-04 09:23:45 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-06-04 09:23:45 +0300 |
| commit | 94c09aab1dac228a9ddf03abd7d76559b5d6af16 (patch) | |
| tree | 9a02c6407dded2f74b6790f8686c4ab7c8777b21 /src/core/api | |
| parent | f08b503f680e8a6d4021d2fd21d2386f8e60da24 (diff) | |
| parent | 0efae85f199a61fd6919703cfbb74d680d9a9443 (diff) | |
Merge tag 'v6.5.6-lts' into 6.5.66.5.6
Qt 6.5.6-lts release
Conflicts solved:
dependencies.yaml
Change-Id: I31ed402989d58b5195459a8a3bf309e6354c35f6
Diffstat (limited to 'src/core/api')
| -rw-r--r-- | src/core/api/Qt6WebEngineCoreMacros.cmake | 2 | ||||
| -rw-r--r-- | src/core/api/configure.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/api/Qt6WebEngineCoreMacros.cmake b/src/core/api/Qt6WebEngineCoreMacros.cmake index 6c335aad1..8bb731548 100644 --- a/src/core/api/Qt6WebEngineCoreMacros.cmake +++ b/src/core/api/Qt6WebEngineCoreMacros.cmake @@ -29,7 +29,7 @@ function(qt6_add_webengine_dictionary) set(copyCommand COMMAND ${CMAKE_COMMAND} -E copy_directory ${ARGS_OUTPUT_DIRECTORY}/dict ${ARGS_OUTPUT_DIRECTORY}/$<CONFIG> ) - elseif((MACOS OR IOS) AND isBundle) + elseif(APPLE AND isBundle) get_target_property(outputName ${ARGS_TARGET} OUTPUT_NAME) if(NOT outputName) set(outputName ${ARGS_TARGET}) diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake index 48f7cacc0..49ad00ed8 100644 --- a/src/core/api/configure.cmake +++ b/src/core/api/configure.cmake @@ -13,7 +13,7 @@ if(NOT QT_CONFIGURE_RUNNING) pkg_check_modules(XDAMAGE xdamage) pkg_check_modules(POPPLER_CPP poppler-cpp IMPORTED_TARGET) pkg_check_modules(GBM gbm) - pkg_check_modules(LIBVA libva) + pkg_check_modules(LIBVA libva>=1.14) if(NOT GIO_FOUND) pkg_check_modules(GIO gio-2.0) endif() @@ -66,7 +66,7 @@ qt_feature("webengine-system-alsa" PRIVATE ) qt_feature("webengine-v8-context-snapshot" PRIVATE LABEL "Use v8 context snapshot" - CONDITION NOT CMAKE_CROSSCOMPILING + AUTODETECT NOT CMAKE_CROSSCOMPILING ) qt_feature("webengine-geolocation" PUBLIC LABEL "Geolocation" |