4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmake: Remove more Qt 5 code

Browse source 
Qt Gui virtualkeyboard plugin was removed in Qt 6.x.
Qt Network Bearer Management was removed in Qt 6.0.
Qt Multimedia mediaservice and audio plugins were removed in Qt 6.x.
This commit is contained in:
Ryan Foster 2024-04-26 14:59:26 -04:00
commit 649c62cfac
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmake/common/helpers_common.cmake
View file

@ -255,10 +255,8 @@ function(find_qt_plugins)
# cmake-format: off
list(APPEND qt_plugins_Core platforms printsupport styles imageformats iconengines)
# cmake-format: on
list(APPEND qt_plugins_Gui platforminputcontexts virtualkeyboard)
list(APPEND qt_plugins_Network bearer)
list(APPEND qt_plugins_Gui platforminputcontexts)
list(APPEND qt_plugins_Sql sqldrivers)
list(APPEND qt_plugins_Multimedia mediaservice audio)
list(APPEND qt_plugins_3dRender sceneparsers geometryloaders)
list(APPEND qt_plugins_3dQuickRender renderplugins)
list(APPEND qt_plugins_Positioning position)

2
cmake/macos/helpers.cmake
View file

@ -450,7 +450,7 @@ function(_bundle_dependencies target)
continue()
endif()
if(library MATCHES "Qt[56]?::.+")
if(library MATCHES "Qt6?::.+")
find_qt_plugins(COMPONENT ${library} TARGET ${target} FOUND_VAR plugins_list)
endif()
list(APPEND library_paths ${library_location})

2
cmake/windows/helpers.cmake
View file

@ -402,7 +402,7 @@ function(_bundle_dependencies target)
endif()
endforeach()
if(library MATCHES "Qt[56]?::.+")
if(library MATCHES "Qt6?::.+")
find_qt_plugins(COMPONENT ${library} TARGET ${target} FOUND_VAR plugins_list)
endif()
endif()