Skip to content

Commit 416c801

Browse files
committed
Address qt_generate_deploy_app_script args incompatability
Qt versions prior to 6.5 used a different set of arguments for qt_generate_deploy_app_script() so set the appropriate arguments based on the version.
1 parent bdc5116 commit 416c801

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

cmake/devtools_qt_helper.cmake

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,18 @@ if (Qt6_DIR)
7373
)")
7474
else()
7575
# Generate deployment script of Qt binaries and plugins
76-
qt_generate_deploy_app_script(TARGET ${PROJECT_NAME}
77-
OUTPUT_SCRIPT deploy_script
78-
NO_UNSUPPORTED_PLATFORM_ERROR
79-
NO_TRANSLATIONS
76+
if (QT_VERSION_MAJOR EQUAL 6 AND QT_VERSION_MINOR GREATER_EQUAL 5)
77+
qt_generate_deploy_app_script(TARGET ${PROJECT_NAME}
78+
OUTPUT_SCRIPT deploy_script
79+
NO_UNSUPPORTED_PLATFORM_ERROR
80+
NO_TRANSLATIONS
81+
)
82+
else()
83+
qt_generate_deploy_app_script(TARGET ${PROJECT_NAME}
84+
FILENAME_VARIABLE deploy_script
85+
NO_UNSUPPORTED_PLATFORM_ERROR
8086
)
87+
endif()
8188
endif()
8289

8390
install(SCRIPT ${deploy_script} COMPONENT ${component})

0 commit comments

Comments
 (0)