summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeander Beernaert <leander.beernaert@qt.io>2020-02-06 11:36:12 +0100
committerLeander Beernaert <leander.beernaert@qt.io>2020-02-06 12:22:09 +0000
commitcb1fbfa1a035fc0c9ed71a202bff957253b6d229 (patch)
tree0cef1a530ad8ec28472b94713f44d7547e1f0e7a
parent2c297ac598c273d1109f1418ee4ff64357f486a6 (diff)
Remove qt_add_qml_module() from QtBuild
This bit is being move to QtDeclarative as it is not required to build QtBase. Change-Id: I7b559b8b0e33e66d92c97c93bc43b650e7150237 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--cmake/QtBuild.cmake169
1 files changed, 0 insertions, 169 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index ddfef56fbd..c195ed9b44 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -2462,171 +2462,6 @@ function(qt_add_resource target resourceName)
endfunction()
-
-# This function creates a CMake target for qml modules. It will also make
-# sure that if no C++ source are present, that qml files show up in the project
-# in an IDE. Finally, it will also create a custom ${target}_qmltypes which
-# can be used to generate the respective plugin.qmltypes file.
-#
-# CPP_PLUGIN: Whether this qml module has any c++ source files.
-# URI: Module's uri.
-# TARGET_PATH: Expected installation path for the Qml Module. Equivalent
-# to the module's URI where '.' is replaced with '/'. Use this to override the
-# default substitution pattern.
-# VERSION: Version of the qml module
-# QML_PLUGINDUMP_DEPENDENCIES: Path to a dependencies.json file to be consumed
-# with the ${target}_qmltypes target (optional)
-# SKIP_TYPE_REGISTRATION: All qml files are expected to be registered by the
-# c++ plugin code.
-#
-function(qt_add_qml_module target)
-
- set(qml_module_optional_args
- GENERATE_QMLTYPES
- DESIGNER_SUPPORTED
- DO_NOT_INSTALL
- SKIP_TYPE_REGISTRATION
- )
-
- set(qml_module_single_args
- URI
- TARGET_PATH
- VERSION
- QML_PLUGINDUMP_DEPENDENCIES
- CLASSNAME
- )
-
- set(qml_module_multi_args
- IMPORTS
- TYPEINFO
- DEPENDENCIES
- )
-
- qt_parse_all_arguments(arg "qt_add_qml_module"
- "${__qt_add_plugin_optional_args};${qml_module_optional_args}"
- "${__qt_add_plugin_single_args};${qml_module_single_args}"
- "${__qt_add_plugin_multi_args};${qml_module_multi_args}" ${ARGN})
-
- if (NOT arg_URI)
- message(FATAL_ERROR "qt_add_qml_module called without specifying the module's uri. Please specify one using the URI parameter.")
- endif()
-
- set(target_path ${arg_TARGET_PATH})
-
- if (NOT arg_VERSION)
- message(FATAL_ERROR "qt_add_qml_module called without specifying the module's import version. Please specify one using the VERSION parameter.")
- endif()
-
- if (NOT arg_TARGET_PATH)
- string(REPLACE "." "/" arg_TARGET_PATH ${arg_URI})
- endif()
-
- qt_remove_args(plugin_args
- ARGS_TO_REMOVE
- ${target}
- ${qml_module_multi_args}
- ${qml_module_single_args}
- ALL_ARGS
- ${__qt_add_plugin_optional_args}
- ${__qt_add_plugin_single_args}
- ${qml_module_single_args}
- ${__qt_add_plugin_multi_args}
- ${qml_module_multi_args}
- ARGS
- ${ARGV}
- )
-
- # If we have no sources, but qml files, create a custom target so the
- # qml file will be visibile in an IDE.
- if (arg_SOURCES)
- qt_add_plugin(${target}
- TYPE
- qml_plugin
- QML_TARGET_PATH
- "${arg_TARGET_PATH}"
- ${plugin_args}
- )
- endif()
-
-
- if (arg_CPP_PLUGIN)
- set(no_create_option DO_NOT_CREATE_TARGET)
- endif()
-
- if (arg_CLASSNAME)
- set(classname_arg CLASSNAME ${arg_CLASSNAME})
- endif()
-
- if (arg_DESIGNER_SUPPORTED)
- set(designer_supported_arg DESIGNER_SUPPORTED)
- endif()
-
- if (arg_SKIP_TYPE_REGISTRATION)
- set(skip_registration_arg SKIP_TYPE_REGISTRATION)
- endif()
-
- if (arg_GENERATE_QMLTYPES)
- set(generate_qmltypes_arg GENERATE_QMLTYPES)
- endif()
-
- qt_path_join(qml_module_install_dir ${QT_INSTALL_DIR} "${INSTALL_QMLDIR}/${arg_TARGET_PATH}")
-
- qt6_add_qml_module(${target}
- ${designer_supported_arg}
- ${no_create_option}
- ${skip_registration_arg}
- ${classname_arg}
- ${generate_qmltypes_arg}
- RESOURCE_PREFIX "/qt-project.org/imports"
- TARGET_PATH ${arg_TARGET_PATH}
- URI ${arg_URI}
- VERSION ${arg_VERSION}
- QML_FILES ${arg_QML_FILES}
- IMPORTS "${arg_IMPORTS}"
- TYPEINFO "${arg_TYPEINFO}"
- DO_NOT_INSTALL_METADATA
- DO_NOT_CREATE_TARGET
- INSTALL_QML_FILES
- INSTALL_LOCATION "${qml_module_install_dir}"
- DEPENDENCIES ${arg_DEPENDENCIES}
- RESOURCE_EXPORT "${INSTALL_CMAKE_NAMESPACE}${target}Targets"
- )
-
- get_target_property(qmldir_file ${target} QT_QML_MODULE_QMLDIR_FILE)
- get_target_property(plugin_types ${target} QT_QML_MODULE_PLUGIN_TYPES_FILE)
- set(files_to_install)
- if (EXISTS ${plugin_types})
- list(APPEND files_to_install ${plugin_types})
- qt_copy_or_install(FILES ${plugin_types}
- DESTINATION "${qml_module_install_dir}"
- )
-
- if(QT_WILL_INSTALL)
- # plugin.qmltypes when present should also be copied to the
- # cmake binary dir when doing prefix builds
- file(COPY ${plugin_types}
- DESTINATION "${QT_BUILD_DIR}/${INSTALL_QMLDIR}/${arg_TARGET_PATH}"
- )
- endif()
- endif()
-
- list(APPEND files_to_install ${qmldir_file})
- if (QT_WILL_INSTALL)
- install(FILES ${files_to_install} DESTINATION ${qml_module_install_dir})
- endif()
-
- set(copy_destination "${QT_BUILD_DIR}/${INSTALL_QMLDIR}/${arg_TARGET_PATH}")
- foreach(file IN LISTS files_to_install)
- get_filename_component(file_name "${file}" NAME)
- add_custom_command(TARGET ${target} POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
- "${file}"
- "${copy_destination}/${file_name}"
- COMMENT "Copying ${file} to ${copy_destination}"
- )
- endforeach()
-endfunction()
-
# Collection of qt_add_executable arguments so they can be shared across qt_add_executable
# and qt_add_test_helper.
set(__qt_add_executable_optional_args
@@ -4088,10 +3923,6 @@ function(add_qt_resource)
qt_add_resource(${ARGV})
endfunction()
-function(add_qml_module)
- qt_add_qml_module(${ARGV})
-endfunction()
-
function(add_cmake_library)
qt_add_cmake_library(${ARGV})
endfunction()