Add CMake build

Task-number: QTBUG-89299
Change-Id: I5becbf39605e566c3d32cb5e210d974df9de27da
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

3 files changed, 187 insertions, 81 deletions

diff --git a/src/datavisualizationqml2/CMakeLists.txt b/src/datavisualizationqml2/CMakeLists.txt
new file mode 100644
index 00000000..2b191e41
--- /dev/null
+++ b/src/datavisualizationqml2/CMakeLists.txt
@@ -0,0 +1,101 @@
+qt_internal_add_qml_module(DataVisualizationQml2
+    URI "QtDataVisualization"
+    VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
+    CLASSNAME QtDataVisualizationQml2Plugin
+    SKIP_TYPE_REGISTRATION
+    SOURCES
+        abstractdeclarative.cpp abstractdeclarative_p.h
+        colorgradient.cpp colorgradient_p.h
+        datavisualizationqml2_plugin.cpp datavisualizationqml2_plugin.h
+        declarativebars.cpp declarativebars_p.h
+        declarativecolor.cpp declarativecolor_p.h
+        declarativerendernode.cpp declarativerendernode_p.h
+        declarativescatter.cpp declarativescatter_p.h
+        declarativescene.cpp declarativescene_p.h
+        declarativeseries.cpp declarativeseries_p.h
+        declarativesurface.cpp declarativesurface_p.h
+        declarativetheme.cpp declarativetheme_p.h
+        enumtostringmap.cpp enumtostringmap_p.h
+        glstatestore.cpp glstatestore_p.h
+    INCLUDE_DIRECTORIES
+        ../../include
+        ../../include/QtDataVisualization
+        ../datavisualization/axis
+        ../datavisualization/data
+        ../datavisualization/engine
+        ../datavisualization/global
+        ../datavisualization/input
+        ../datavisualization/theme
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::OpenGL
+        Qt::Qml
+        Qt::Quick
+        DataVisualization
+)
+
+qt_extend_target(DataVisualizationQml2 CONDITION MACOS
+    PUBLIC_LIBRARIES
+        Qt::GuiPrivate
+)
+
+set(qml_files
+    "designer/Bars3DSpecifics.qml"
+    "designer/Scatter3DSpecifics.qml"
+    "designer/Surface3DSpecifics.qml"
+    "designer/default/Bars3D.qml"
+    "designer/default/Scatter3D.qml"
+    "designer/default/Surface3D.qml"
+    "designer/qtdatavisualization.metainfo"
+    "designer/images/bars3d-icon.png"
+    "designer/images/bars3d-icon16.png"
+    "designer/images/scatter3d-icon.png"
+    "designer/images/scatter3d-icon16.png"
+    "designer/images/surface3d-icon.png"
+    "designer/images/surface3d-icon16.png"
+)
+set_source_files_properties(designer/Bars3DSpecifics.qml PROPERTIES
+    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(designer/Scatter3DSpecifics.qml PROPERTIES
+    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(designer/Surface3DSpecifics.qml PROPERTIES
+    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(designer/default/Bars3D.qml PROPERTIES
+    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(designer/default/Scatter3D.qml PROPERTIES
+    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(designer/default/Surface3D.qml PROPERTIES
+    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(designer/qtdatavisualization.metainfo PROPERTIES
+    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(designer/images/bars3d-icon.png PROPERTIES
+    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(designer/images/bars3d-icon16.png PROPERTIES
+    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(designer/images/scatter3d-icon.png PROPERTIES
+    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(designer/images/scatter3d-icon16.png PROPERTIES
+    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(designer/images/surface3d-icon.png PROPERTIES
+    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(designer/images/surface3d-icon16.png PROPERTIES
+    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+
+qt6_target_qml_files(DataVisualizationQml2
+    FILES
+        ${qml_files}
+)
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
index 5b515a04..a54971cc 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
@@ -27,12 +27,97 @@
 **
 ****************************************************************************/
 
+#include "declarativebars_p.h"
+#include "declarativescatter_p.h"
+#include "declarativesurface_p.h"
+#include "qitemmodelbardataproxy.h"
+#include "qitemmodelscatterdataproxy.h"
+#include "qitemmodelsurfacedataproxy.h"
+#include "qheightmapsurfacedataproxy.h"
+#include "qvalue3daxis.h"
+#include "qvalue3daxisformatter.h"
+#include "qlogvalue3daxisformatter.h"
+#include "qcategory3daxis.h"
+#include "q3dobject.h"
+#include "q3dcamera.h"
+#include "q3dscene.h"
+#include "q3dlight.h"
+#include "qabstract3dseries.h"
+#include "qbar3dseries.h"
+#include "qscatter3dseries.h"
+#include "qsurface3dseries.h"
+#include "declarativeseries_p.h"
+#include "q3dtheme.h"
+#include "declarativetheme_p.h"
+#include "q3dinputhandler.h"
+#include "qtouch3dinputhandler.h"
+#include "declarativecolor_p.h"
+#include "declarativescene_p.h"
+#include "qcustom3ditem.h"
+#include "qcustom3dlabel.h"
+#include "qcustom3dvolume.h"
 #include "datavisualizationqml2_plugin.h"
 
 #include <QtQml>
 
+
+QML_DECLARE_TYPE(AbstractDeclarative)
+QML_DECLARE_TYPE(DeclarativeBars)
+QML_DECLARE_TYPE(DeclarativeScatter)
+QML_DECLARE_TYPE(DeclarativeSurface)
+
+QML_DECLARE_TYPE(QAbstractItemModel)
+
+QML_DECLARE_TYPE(QAbstract3DAxis)
+QML_DECLARE_TYPE(QCategory3DAxis)
+QML_DECLARE_TYPE(QValue3DAxis)
+QML_DECLARE_TYPE(QValue3DAxisFormatter)
+QML_DECLARE_TYPE(QLogValue3DAxisFormatter)
+
+QML_DECLARE_TYPE(Q3DScene)
+QML_DECLARE_TYPE(Declarative3DScene)
+QML_DECLARE_TYPE(Q3DObject)
+QML_DECLARE_TYPE(Q3DCamera)
+QML_DECLARE_TYPE(Q3DLight)
+
+QML_DECLARE_TYPE(QAbstractDataProxy)
+QML_DECLARE_TYPE(QBarDataProxy)
+QML_DECLARE_TYPE(QItemModelBarDataProxy)
+QML_DECLARE_TYPE(QScatterDataProxy)
+QML_DECLARE_TYPE(QItemModelScatterDataProxy)
+QML_DECLARE_TYPE(QSurfaceDataProxy)
+QML_DECLARE_TYPE(QItemModelSurfaceDataProxy)
+QML_DECLARE_TYPE(QHeightMapSurfaceDataProxy)
+
+QML_DECLARE_TYPE(QAbstract3DSeries)
+QML_DECLARE_TYPE(QBar3DSeries)
+QML_DECLARE_TYPE(QScatter3DSeries)
+QML_DECLARE_TYPE(QSurface3DSeries)
+QML_DECLARE_TYPE(DeclarativeBar3DSeries)
+QML_DECLARE_TYPE(DeclarativeScatter3DSeries)
+QML_DECLARE_TYPE(DeclarativeSurface3DSeries)
+
+QML_DECLARE_TYPE(ColorGradientStop)
+QML_DECLARE_TYPE(ColorGradient)
+
+QML_DECLARE_TYPE(DeclarativeColor)
+
+QML_DECLARE_TYPE(Q3DTheme)
+QML_DECLARE_TYPE(DeclarativeTheme3D)
+
+QML_DECLARE_TYPE(QAbstract3DInputHandler)
+QML_DECLARE_TYPE(Q3DInputHandler)
+QML_DECLARE_TYPE(QTouch3DInputHandler)
+
+QML_DECLARE_TYPE(QCustom3DItem)
+QML_DECLARE_TYPE(QCustom3DLabel)
+QML_DECLARE_TYPE(QCustom3DVolume)
+
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
+
+
+
 void QtDataVisualizationQml2Plugin::registerTypes(const char *uri)
 {
     // @uri QtDataVisualization
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
index d997f8c1..73c7b1e1 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
@@ -30,92 +30,12 @@
 #ifndef DATAVISUALIZATIONQML2_PLUGIN_H
 #define DATAVISUALIZATIONQML2_PLUGIN_H
 
-#include "datavisualizationglobal_p.h"
-#include "declarativebars_p.h"
-#include "declarativescatter_p.h"
-#include "declarativesurface_p.h"
-#include "qitemmodelbardataproxy.h"
-#include "qitemmodelscatterdataproxy.h"
-#include "qitemmodelsurfacedataproxy.h"
-#include "qheightmapsurfacedataproxy.h"
-#include "qvalue3daxis.h"
-#include "qvalue3daxisformatter.h"
-#include "qlogvalue3daxisformatter.h"
-#include "qcategory3daxis.h"
-#include "q3dobject.h"
-#include "q3dcamera.h"
-#include "q3dscene.h"
-#include "q3dlight.h"
-#include "qabstract3dseries.h"
-#include "qbar3dseries.h"
-#include "qscatter3dseries.h"
-#include "qsurface3dseries.h"
-#include "declarativeseries_p.h"
-#include "q3dtheme.h"
-#include "declarativetheme_p.h"
-#include "q3dinputhandler.h"
-#include "qtouch3dinputhandler.h"
-#include "declarativecolor_p.h"
-#include "declarativescene_p.h"
-#include "qcustom3ditem.h"
-#include "qcustom3dlabel.h"
-#include "qcustom3dvolume.h"
-
 #include <QtQml/QQmlExtensionPlugin>
+#include "datavisualizationglobal_p.h"
 
 using namespace QtDataVisualization;
 
-QML_DECLARE_TYPE(AbstractDeclarative)
-QML_DECLARE_TYPE(DeclarativeBars)
-QML_DECLARE_TYPE(DeclarativeScatter)
-QML_DECLARE_TYPE(DeclarativeSurface)
-
-QML_DECLARE_TYPE(QAbstractItemModel)
-
-QML_DECLARE_TYPE(QAbstract3DAxis)
-QML_DECLARE_TYPE(QCategory3DAxis)
-QML_DECLARE_TYPE(QValue3DAxis)
-QML_DECLARE_TYPE(QValue3DAxisFormatter)
-QML_DECLARE_TYPE(QLogValue3DAxisFormatter)
-
-QML_DECLARE_TYPE(Q3DScene)
-QML_DECLARE_TYPE(Declarative3DScene)
-QML_DECLARE_TYPE(Q3DObject)
-QML_DECLARE_TYPE(Q3DCamera)
-QML_DECLARE_TYPE(Q3DLight)
-
-QML_DECLARE_TYPE(QAbstractDataProxy)
-QML_DECLARE_TYPE(QBarDataProxy)
-QML_DECLARE_TYPE(QItemModelBarDataProxy)
-QML_DECLARE_TYPE(QScatterDataProxy)
-QML_DECLARE_TYPE(QItemModelScatterDataProxy)
-QML_DECLARE_TYPE(QSurfaceDataProxy)
-QML_DECLARE_TYPE(QItemModelSurfaceDataProxy)
-QML_DECLARE_TYPE(QHeightMapSurfaceDataProxy)
-
-QML_DECLARE_TYPE(QAbstract3DSeries)
-QML_DECLARE_TYPE(QBar3DSeries)
-QML_DECLARE_TYPE(QScatter3DSeries)
-QML_DECLARE_TYPE(QSurface3DSeries)
-QML_DECLARE_TYPE(DeclarativeBar3DSeries)
-QML_DECLARE_TYPE(DeclarativeScatter3DSeries)
-QML_DECLARE_TYPE(DeclarativeSurface3DSeries)
-
-QML_DECLARE_TYPE(ColorGradientStop)
-QML_DECLARE_TYPE(ColorGradient)
-
-QML_DECLARE_TYPE(DeclarativeColor)
-
-QML_DECLARE_TYPE(Q3DTheme)
-QML_DECLARE_TYPE(DeclarativeTheme3D)
-
-QML_DECLARE_TYPE(QAbstract3DInputHandler)
-QML_DECLARE_TYPE(Q3DInputHandler)
-QML_DECLARE_TYPE(QTouch3DInputHandler)
 
-QML_DECLARE_TYPE(QCustom3DItem)
-QML_DECLARE_TYPE(QCustom3DLabel)
-QML_DECLARE_TYPE(QCustom3DVolume)
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION