Fix qml designer files installation

Change-Id: Ifba5203be0d10adec479c2a171d460f1675b5eca
Fixes: QTBUG-94472
Pick-to: 6.2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

4 files changed, 68 insertions, 205 deletions

diff --git a/src/chartsqml2/CMakeLists.txt b/src/chartsqml2/CMakeLists.txt
index 848f9c10..76ed1338 100644
--- a/src/chartsqml2/CMakeLists.txt
+++ b/src/chartsqml2/CMakeLists.txt
@@ -1,214 +1,10 @@
-set(qml_files
-    "designer/ChartViewSpecifics.qml"
-    "designer/default/AreaSeries.qml"
-    "designer/default/BarSeries.qml"
-    "designer/default/BoxPlotSeries.qml"
-    "designer/default/HorizontalBarSeries.qml"
-    "designer/default/HorizontalPercentBarSeries.qml"
-    "designer/default/HorizontalStackedBarSeries.qml"
-    "designer/default/LineSeries.qml"
-    "designer/default/PercentBarSeries.qml"
-    "designer/default/PieSeries.qml"
-    "designer/default/ScatterSeries.qml"
-    "designer/default/SplineSeries.qml"
-    "designer/default/StackedBarSeries.qml"
-    "designer/default/PolarAreaSeries.qml"
-    "designer/default/PolarLineSeries.qml"
-    "designer/default/PolarScatterSeries.qml"
-    "designer/default/PolarSplineSeries.qml"
-    "designer/qtcharts.metainfo"
-    "designer/images/areaseries-chart-icon.png"
-    "designer/images/areaseries-chart-icon16.png"
-    "designer/images/barseries-icon.png"
-    "designer/images/barseries-icon16.png"
-    "designer/images/boxplotseries-chart-icon.png"
-    "designer/images/boxplotseries-chart-icon16.png"
-    "designer/images/horizontalbarseries-icon.png"
-    "designer/images/horizontalbarseries-icon16.png"
-    "designer/images/horizontalpercentbarseries-icon.png"
-    "designer/images/horizontalpercentbarseries-icon16.png"
-    "designer/images/horizontalstackedbarseries-icon.png"
-    "designer/images/horizontalstackedbarseries-icon16.png"
-    "designer/images/lineseries-chart-icon.png"
-    "designer/images/lineseries-chart-icon16.png"
-    "designer/images/percentbarseries-icon.png"
-    "designer/images/percentbarseries-icon16.png"
-    "designer/images/pieseries-chart-icon.png"
-    "designer/images/pieseries-chart-icon16.png"
-    "designer/images/scatterseries-chart-icon.png"
-    "designer/images/scatterseries-chart-icon16.png"
-    "designer/images/splineseries-chart-icon.png"
-    "designer/images/splineseries-chart-icon16.png"
-    "designer/images/stackedbarseries-icon.png"
-    "designer/images/stackedbarseries-icon16.png"
-    "designer/images/areaseries-polar-icon.png"
-    "designer/images/areaseries-polar-icon16.png"
-    "designer/images/lineseries-polar-icon.png"
-    "designer/images/lineseries-polar-icon16.png"
-    "designer/images/scatterseries-polar-icon.png"
-    "designer/images/scatterseries-polar-icon16.png"
-    "designer/images/splineseries-polar-icon.png"
-    "designer/images/splineseries-polar-icon16.png"
-)
-
-set_source_files_properties(designer/ChartViewSpecifics.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/AreaSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/BarSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/BoxPlotSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/HorizontalBarSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/HorizontalPercentBarSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/HorizontalStackedBarSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/LineSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/PercentBarSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/PieSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/ScatterSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/SplineSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/StackedBarSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/PolarAreaSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/PolarLineSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/PolarScatterSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/default/PolarSplineSeries.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/qtcharts.metainfo PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/areaseries-chart-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/areaseries-chart-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/barseries-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/barseries-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/boxplotseries-chart-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/boxplotseries-chart-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/horizontalbarseries-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/horizontalbarseries-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/horizontalpercentbarseries-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/horizontalpercentbarseries-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/horizontalstackedbarseries-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/horizontalstackedbarseries-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/lineseries-chart-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/lineseries-chart-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/percentbarseries-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/percentbarseries-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/pieseries-chart-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/pieseries-chart-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/scatterseries-chart-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/scatterseries-chart-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/splineseries-chart-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/splineseries-chart-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/stackedbarseries-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/stackedbarseries-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/areaseries-polar-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/areaseries-polar-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/lineseries-polar-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/lineseries-polar-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/scatterseries-polar-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/scatterseries-polar-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/splineseries-polar-icon.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-set_source_files_properties(designer/images/splineseries-polar-icon16.png PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
-)
-
 qt_internal_add_qml_module(ChartsQml
     URI "QtCharts" # special case
     VERSION "${PROJECT_VERSION}"
     CLASS_NAME QtChartsQml2Plugin
     PLUGIN_TARGET qtchartsqml2
-    QML_FILES ${qml_files}
     PAST_MAJOR_VERSIONS 1 2
+    DESIGNER_SUPPORTED
     DEPENDENCIES
         QtQuick
         QtCharts
@@ -285,3 +81,5 @@ qt_internal_extend_target(ChartsQml CONDITION QT_FEATURE_charts_candlestick_char
     SOURCES
         declarativecandlestickseries.cpp declarativecandlestickseries_p.h
 )
+
+add_subdirectory(designer)
diff --git a/src/chartsqml2/designer/CMakeLists.txt b/src/chartsqml2/designer/CMakeLists.txt
new file mode 100644
index 00000000..42115e7b
--- /dev/null
+++ b/src/chartsqml2/designer/CMakeLists.txt
@@ -0,0 +1,9 @@
+qt_copy_or_install(
+    FILES
+        ChartViewSpecifics.qml
+        qtcharts.metainfo
+    DESTINATION "${INSTALL_QMLDIR}/QtCharts/designer"
+)
+
+add_subdirectory(default)
+add_subdirectory(images)
diff --git a/src/chartsqml2/designer/default/CMakeLists.txt b/src/chartsqml2/designer/default/CMakeLists.txt
new file mode 100644
index 00000000..ccf366d8
--- /dev/null
+++ b/src/chartsqml2/designer/default/CMakeLists.txt
@@ -0,0 +1,20 @@
+qt_copy_or_install(
+    FILES
+        AreaSeries.qml
+        BarSeries.qml
+        BoxPlotSeries.qml
+        HorizontalBarSeries.qml
+        HorizontalPercentBarSeries.qml
+        HorizontalStackedBarSeries.qml
+        LineSeries.qml
+        PercentBarSeries.qml
+        PieSeries.qml
+        ScatterSeries.qml
+        SplineSeries.qml
+        StackedBarSeries.qml
+        PolarAreaSeries.qml
+        PolarLineSeries.qml
+        PolarScatterSeries.qml
+        PolarSplineSeries.qml
+    DESTINATION "${INSTALL_QMLDIR}/QtCharts/designer/default"
+)
diff --git a/src/chartsqml2/designer/images/CMakeLists.txt b/src/chartsqml2/designer/images/CMakeLists.txt
new file mode 100644
index 00000000..0487f007
--- /dev/null
+++ b/src/chartsqml2/designer/images/CMakeLists.txt
@@ -0,0 +1,36 @@
+qt_copy_or_install(
+    FILES
+        areaseries-chart-icon.png
+        areaseries-chart-icon16.png
+        barseries-icon.png
+        barseries-icon16.png
+        boxplotseries-chart-icon.png
+        boxplotseries-chart-icon16.png
+        horizontalbarseries-icon.png
+        horizontalbarseries-icon16.png
+        horizontalpercentbarseries-icon.png
+        horizontalpercentbarseries-icon16.png
+        horizontalstackedbarseries-icon.png
+        horizontalstackedbarseries-icon16.png
+        lineseries-chart-icon.png
+        lineseries-chart-icon16.png
+        percentbarseries-icon.png
+        percentbarseries-icon16.png
+        pieseries-chart-icon.png
+        pieseries-chart-icon16.png
+        scatterseries-chart-icon.png
+        scatterseries-chart-icon16.png
+        splineseries-chart-icon.png
+        splineseries-chart-icon16.png
+        stackedbarseries-icon.png
+        stackedbarseries-icon16.png
+        areaseries-polar-icon.png
+        areaseries-polar-icon16.png
+        lineseries-polar-icon.png
+        lineseries-polar-icon16.png
+        scatterseries-polar-icon.png
+        scatterseries-polar-icon16.png
+        splineseries-polar-icon.png
+        splineseries-polar-icon16.png
+    DESTINATION "${INSTALL_QMLDIR}/QtCharts/designer/images"
+)