Skip to content

Commit 649c62c

Browse files
committed
cmake: Remove more Qt 5 code
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.
1 parent e693f64 commit 649c62c

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

cmake/common/helpers_common.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,8 @@ function(find_qt_plugins)
255255
# cmake-format: off
256256
list(APPEND qt_plugins_Core platforms printsupport styles imageformats iconengines)
257257
# cmake-format: on
258-
list(APPEND qt_plugins_Gui platforminputcontexts virtualkeyboard)
259-
list(APPEND qt_plugins_Network bearer)
258+
list(APPEND qt_plugins_Gui platforminputcontexts)
260259
list(APPEND qt_plugins_Sql sqldrivers)
261-
list(APPEND qt_plugins_Multimedia mediaservice audio)
262260
list(APPEND qt_plugins_3dRender sceneparsers geometryloaders)
263261
list(APPEND qt_plugins_3dQuickRender renderplugins)
264262
list(APPEND qt_plugins_Positioning position)

cmake/macos/helpers.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ function(_bundle_dependencies target)
450450
continue()
451451
endif()
452452

453-
if(library MATCHES "Qt[56]?::.+")
453+
if(library MATCHES "Qt6?::.+")
454454
find_qt_plugins(COMPONENT ${library} TARGET ${target} FOUND_VAR plugins_list)
455455
endif()
456456
list(APPEND library_paths ${library_location})

cmake/windows/helpers.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ function(_bundle_dependencies target)
402402
endif()
403403
endforeach()
404404

405-
if(library MATCHES "Qt[56]?::.+")
405+
if(library MATCHES "Qt6?::.+")
406406
find_qt_plugins(COMPONENT ${library} TARGET ${target} FOUND_VAR plugins_list)
407407
endif()
408408
endif()

0 commit comments

Comments
 (0)