diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-30 11:41:51 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-01-06 00:00:55 +0100 |
| commit | 5121effa745cf88b6d50630249570113941c2ca2 (patch) | |
| tree | 632ed3f3324667366ced2329459f9ca6205941af /cmake | |
| parent | 5836832dfde5687dae5762509e560e1c7f2258ce (diff) | |
| download | qtwebengine-5121effa745cf88b6d50630249570113941c2ca2.tar.gz | |
Adaptations for 108-based
Pick-to: 6.5
Fixes: QTBUG-105147
Change-Id: I0022964903f3443cc97843c62468ab9be8ae2ed8
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Functions.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index e2ccdd9f1..bd892ee20 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -459,7 +459,7 @@ function(add_linker_options target buildDir completeStatic) endif() if(WIN32) get_copy_of_response_file(objects_rsp ${target} objects) - target_link_options(${cmakeTarget} PRIVATE /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll) + target_link_options(${cmakeTarget} PRIVATE /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:winmm.dll) target_link_options(${cmakeTarget} PRIVATE "$<$<CONFIG:${config}>:@${objects_rsp}>") if(NOT completeStatic) get_copy_of_response_file(archives_rsp ${target} archives) @@ -800,7 +800,7 @@ endmacro() macro(append_build_type_setup) list(APPEND gnArgArg - use_qt=true + is_qtwebengine=true init_stack_vars=false is_component_build=false is_shared=true |