1 files changed, 32 insertions, 5 deletions
diff --git a/src/datavisualization/CMakeLists.txt b/src/datavisualization/CMakeLists.txt
index d0607248..27f82340 100644
--- a/src/datavisualization/CMakeLists.txt
+++ b/src/datavisualization/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 qt_internal_add_module(DataVisualization
     TARGET_PRODUCT "Qt Data Visualization (Qt $$QT_VERSION)"
     TARGET_DESCRIPTION "3D Data Visualization component for Qt."
@@ -34,6 +37,7 @@ qt_internal_add_module(DataVisualization
         data/scatteritemmodelhandler.cpp data/scatteritemmodelhandler_p.h
         data/scatterrenderitem.cpp data/scatterrenderitem_p.h
         data/surfaceitemmodelhandler.cpp data/surfaceitemmodelhandler_p.h
+        engine/abstractdeclarativeinterface.cpp engine/abstractdeclarativeinterface_p.h
         engine/abstract3dcontroller.cpp engine/abstract3dcontroller_p.h
         engine/abstract3drenderer.cpp engine/abstract3drenderer_p.h
         engine/axisrendercache.cpp engine/axisrendercache_p.h
@@ -76,6 +80,20 @@ qt_internal_add_module(DataVisualization
         utils/texturehelper.cpp utils/texturehelper_p.h
         utils/utils.cpp utils/utils_p.h
         utils/vertexindexer.cpp utils/vertexindexer_p.h
+    NO_PCH_SOURCES
+        # undef QT_NO_FOREACH:
+        engine/abstract3dcontroller.cpp
+        engine/abstract3drenderer.cpp
+        engine/axisrendercache.cpp
+        engine/bars3dcontroller.cpp
+        engine/bars3drenderer.cpp
+        engine/q3dscatter.cpp
+        engine/q3dsurface.cpp
+        engine/scatter3dcontroller.cpp
+        engine/scatter3drenderer.cpp
+        engine/surface3dcontroller.cpp
+        engine/surface3drenderer.cpp
+        # end undef QT_NO_FOREACH
     INCLUDE_DIRECTORIES
         axis
         data
@@ -84,13 +102,11 @@ qt_internal_add_module(DataVisualization
         input
         theme
         utils
-        ../datavisualizationqml
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::OpenGL
-        Qt::Qml
-        Qt::Quick
+    GENERATE_CPP_EXPORTS
 )
 
 set_source_files_properties("engine/meshes/arrowFlat.obj"
@@ -371,7 +387,7 @@ set(shader_resource_files
     "engine/shaders/texture_ES2.frag"
 )
 
-qt_internal_add_resource(DataVisualization "shaders"
+qt_internal_add_resource(DataVisualization "datavisualizationshaders"
     PREFIX
         "/shaders"
     BASE
@@ -380,7 +396,7 @@ qt_internal_add_resource(DataVisualization "shaders"
         ${shader_resource_files}
 )
 
-qt_internal_add_resource(DataVisualization "meshes"
+qt_internal_add_resource(DataVisualization "datavisualizationmeshes"
     PREFIX
         "/defaultMeshes"
     BASE
@@ -397,6 +413,17 @@ qt_internal_extend_target(DataVisualization CONDITION MACOS
     PRIVATE_MODULE_INTERFACE
         Qt::GuiPrivate
 )
+
+qt_internal_extend_target(DataVisualization CONDITION MINGW
+    NO_UNITY_BUILD_SOURCES
+        data/qbardataitem.cpp
+        data/qscatterdataitem.cpp
+        data/qsurfacedataitem.cpp
+    # MinGW triggers `-Werror=maybe-uninitialized` on d_ptr while
+    # proper checks are in place and d_ptr is initialized in
+    # operator=()
+)
+
 qt_internal_add_docs(DataVisualization
     doc/qtdatavis3d.qdocconf
 )