From 1c2ad83d8be91ba18b398f729f88fd718e6c6900 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 11 Nov 2020 14:35:16 +0100 Subject: CMake: Handle installation of AUX_QML_FILES Use the new pro2cmake functionality to copy / install the files specified in AUX_QML_FILES entries. Task-number: QTBUG-87818 Change-Id: Ibdee35d54aaf37589d31d113bed67520b57fdbf2 Reviewed-by: Joerg Bornemann --- src/imports/controls/.prev_CMakeLists.txt | 66 +++++++++++++++++++++++++++++++ src/imports/controls/CMakeLists.txt | 66 +++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+) diff --git a/src/imports/controls/.prev_CMakeLists.txt b/src/imports/controls/.prev_CMakeLists.txt index f36a608f..3d97efad 100644 --- a/src/imports/controls/.prev_CMakeLists.txt +++ b/src/imports/controls/.prev_CMakeLists.txt @@ -48,6 +48,72 @@ qt_internal_add_qml_module(qtquickcontrols2plugin ## Scopes: ##################################################################### + +if(QT_FEATURE_quick_designer) + get_target_property(__aux_qml_files_install_base qtquickcontrols2plugin QT_QML_MODULE_INSTALL_DIR) + + file(GLOB_RECURSE __aux_qml_glob_files + RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" + "designer/images/*.png") + qt_path_join(__aux_qml_files_install_dir "${__aux_qml_files_install_base}" "designer/images") + + qt_copy_or_install( + FILES + ${__aux_qml_glob_files} + DESTINATION "${__aux_qml_files_install_dir}") + + qt_path_join(__aux_qml_files_install_dir "${__aux_qml_files_install_base}" "designer") + + qt_copy_or_install( + FILES + designer/AbstractButtonSection.qml + designer/BusyIndicatorSpecifics.qml + designer/ButtonSection.qml + designer/ButtonSpecifics.qml + designer/CheckBoxSpecifics.qml + designer/CheckDelegateSpecifics.qml + designer/CheckSection.qml + designer/ComboBoxSpecifics.qml + designer/ContainerSection.qml + designer/ControlSection.qml + designer/ControlSpecifics.qml + designer/DelayButtonSpecifics.qml + designer/DialSpecifics.qml + designer/FrameSpecifics.qml + designer/GroupBoxSpecifics.qml + designer/InsetSection.qml + designer/ItemDelegateSection.qml + designer/ItemDelegateSpecifics.qml + designer/LabelSpecifics.qml + designer/PaddingSection.qml + designer/PageIndicatorSpecifics.qml + designer/PageSpecifics.qml + designer/PaneSection.qml + designer/PaneSpecifics.qml + designer/ProgressBarSpecifics.qml + designer/RadioButtonSpecifics.qml + designer/RadioDelegateSpecifics.qml + designer/RangeSliderSpecifics.qml + designer/RoundButtonSpecifics.qml + designer/ScrollViewSpecifics.qml + designer/SliderSpecifics.qml + designer/SpinBoxSpecifics.qml + designer/StackViewSpecifics.qml + designer/SwipeDelegateSpecifics.qml + designer/SwipeViewSpecifics.qml + designer/SwitchDelegateSpecifics.qml + designer/SwitchSpecifics.qml + designer/TabBarSpecifics.qml + designer/TabButtonSpecifics.qml + designer/TextAreaSpecifics.qml + designer/TextFieldSpecifics.qml + designer/ToolBarSpecifics.qml + designer/ToolButtonSpecifics.qml + designer/ToolSeparatorSpecifics.qml + designer/TumblerSpecifics.qml + designer/qtquickcontrols2.metainfo + DESTINATION "${__aux_qml_files_install_dir}") +endif() qt_internal_add_docs(qtquickcontrols2plugin doc/qtquickcontrols.qdocconf ) diff --git a/src/imports/controls/CMakeLists.txt b/src/imports/controls/CMakeLists.txt index 2587124f..637e267f 100644 --- a/src/imports/controls/CMakeLists.txt +++ b/src/imports/controls/CMakeLists.txt @@ -48,6 +48,72 @@ qt_internal_add_qml_module(qtquickcontrols2plugin ## Scopes: ##################################################################### + +if(QT_FEATURE_quick_designer) + get_target_property(__aux_qml_files_install_base qtquickcontrols2plugin QT_QML_MODULE_INSTALL_DIR) + + file(GLOB_RECURSE __aux_qml_glob_files + RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" + "designer/images/*.png") + qt_path_join(__aux_qml_files_install_dir "${__aux_qml_files_install_base}" "designer/images") + + qt_copy_or_install( + FILES + ${__aux_qml_glob_files} + DESTINATION "${__aux_qml_files_install_dir}") + + qt_path_join(__aux_qml_files_install_dir "${__aux_qml_files_install_base}" "designer") + + qt_copy_or_install( + FILES + designer/AbstractButtonSection.qml + designer/BusyIndicatorSpecifics.qml + designer/ButtonSection.qml + designer/ButtonSpecifics.qml + designer/CheckBoxSpecifics.qml + designer/CheckDelegateSpecifics.qml + designer/CheckSection.qml + designer/ComboBoxSpecifics.qml + designer/ContainerSection.qml + designer/ControlSection.qml + designer/ControlSpecifics.qml + designer/DelayButtonSpecifics.qml + designer/DialSpecifics.qml + designer/FrameSpecifics.qml + designer/GroupBoxSpecifics.qml + designer/InsetSection.qml + designer/ItemDelegateSection.qml + designer/ItemDelegateSpecifics.qml + designer/LabelSpecifics.qml + designer/PaddingSection.qml + designer/PageIndicatorSpecifics.qml + designer/PageSpecifics.qml + designer/PaneSection.qml + designer/PaneSpecifics.qml + designer/ProgressBarSpecifics.qml + designer/RadioButtonSpecifics.qml + designer/RadioDelegateSpecifics.qml + designer/RangeSliderSpecifics.qml + designer/RoundButtonSpecifics.qml + designer/ScrollViewSpecifics.qml + designer/SliderSpecifics.qml + designer/SpinBoxSpecifics.qml + designer/StackViewSpecifics.qml + designer/SwipeDelegateSpecifics.qml + designer/SwipeViewSpecifics.qml + designer/SwitchDelegateSpecifics.qml + designer/SwitchSpecifics.qml + designer/TabBarSpecifics.qml + designer/TabButtonSpecifics.qml + designer/TextAreaSpecifics.qml + designer/TextFieldSpecifics.qml + designer/ToolBarSpecifics.qml + designer/ToolButtonSpecifics.qml + designer/ToolSeparatorSpecifics.qml + designer/TumblerSpecifics.qml + designer/qtquickcontrols2.metainfo + DESTINATION "${__aux_qml_files_install_dir}") +endif() qt_internal_add_docs(qtquickcontrols2plugin doc/qtquickcontrols.qdocconf ) -- cgit v1.2.3