Skip to content

Commit

Permalink
cmake: Remove more Qt 5 code
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
RytoEX committed Apr 30, 2024
1 parent e693f64 commit 649c62c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions cmake/common/helpers_common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cmake/macos/helpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion cmake/windows/helpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 649c62c

Please sign in to comment.