diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index c328a738b16..c372c428495 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -461,7 +461,6 @@ set(__qt_add_plugin_single_args OUTPUT_DIRECTORY INSTALL_DIRECTORY ARCHIVE_INSTALL_DIRECTORY - QML_TARGET_PATH OUTPUT_NAME ${__default_target_info_args} ) diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake index a90bd995bb8..2df5f6e11de 100644 --- a/cmake/QtPluginHelpers.cmake +++ b/cmake/QtPluginHelpers.cmake @@ -35,12 +35,6 @@ function(qt_internal_add_plugin target) set(output_directory_default "${QT_BUILD_DIR}/${INSTALL_PLUGINSDIR}/${arg_TYPE}") set(install_directory_default "${INSTALL_PLUGINSDIR}/${arg_TYPE}") - if (arg_QML_TARGET_PATH) - set(target_path "${arg_QML_TARGET_PATH}") - set(output_directory_default "${QT_BUILD_DIR}/${INSTALL_QMLDIR}/${target_path}") - set(install_directory_default "${INSTALL_QMLDIR}/${target_path}") - endif() - # Derive the class name from the target name if it's not explicitly specified. # Don't set it for qml plugins though. set(plugin_class_name "") diff --git a/cmake/QtResourceHelpers.cmake b/cmake/QtResourceHelpers.cmake index 1c18de41fdb..3c719d1dd02 100644 --- a/cmake/QtResourceHelpers.cmake +++ b/cmake/QtResourceHelpers.cmake @@ -23,13 +23,13 @@ function(qt_internal_add_resource target resourceName) ) qt_internal_record_rcc_object_files("${target}" "${out_targets}" - INSTALL_LOCATION "${INSTALL_LIBDIR}") + INSTALL_DIRECTORY "${INSTALL_LIBDIR}") endif() endfunction() function(qt_internal_record_rcc_object_files target resource_targets) set(args_optional "") - set(args_single INSTALL_LOCATION) + set(args_single INSTALL_DIRECTORY) set(args_multi "") cmake_parse_arguments(arg @@ -48,7 +48,7 @@ function(qt_internal_record_rcc_object_files target resource_targets) # Compute the install location of a resource object file in a prefix build. # It's comprised of thee following path parts: # - # part (1) INSTALL_LOCATION. + # part (1) INSTALL_DIRECTORY. # A usual value is '${INSTALL_LIBDIR}/' for libraries # and '${INSTALL_QMLDIR}/foo/bar/' for qml plugin resources. # @@ -70,9 +70,9 @@ function(qt_internal_record_rcc_object_files target resource_targets) set(object_file_name "${generated_cpp_file_relative_path}${CMAKE_CXX_OUTPUT_EXTENSION}") qt_path_join(rcc_object_file_path "objects-$" ${out_target} "${object_file_name}") - if(arg_INSTALL_LOCATION) + if(arg_INSTALL_DIRECTORY) qt_path_join(rcc_object_file_path - "${arg_INSTALL_LOCATION}" "${rcc_object_file_path}") + "${arg_INSTALL_DIRECTORY}" "${rcc_object_file_path}") else() message(FATAL_ERROR "No install location given for object files to be installed" " for the following resource target: '${out_target}'")