Clean up CMakeLists.txt

Part of the clean-up requires changing filenames, so that
we can use loops for setting properties instead of setting them
one-by-one.

Task-number: QTBUG-121142
Pick-to: 6.7
Change-Id: I87b21fd6b8018f4c1d9ec276af73811108a1c025
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

src/CMakeLists.txt

@@ -7,25 +7,174 @@ qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/graphs3d/configure.cma
 if(NOT QT_FEATURE_graphs_2d AND NOT QT_FEATURE_graphs_3d)
     message("You must have either FEATURE_graphs_2d or FEATURE_graphs_3d ON, or nothing will be built.")
 else()
-    # First check if 3D is enabled. If it is, we must add dependencies to QtQuick3D.
+    # 2D specific resources
-    # TODO: We could add more branches based on the feature flags for disabling 2D -specific
+    set(shader_resource_files_2D
-    # dependencies (QtQuickPrivate, Qt::QuickShapesPrivate)
+        "graphs2d/data/gridshader.frag.qsb"
-    if(QT_FEATURE_graphs_3d)
+        "graphs2d/data/gridshader.vert.qsb"
-        set(qml_files
+        "graphs2d/data/tickershader.frag.qsb"
-            graphs3d/qml/designer/Bars3DSpecifics.qml
+        "graphs2d/data/tickershader.vert.qsb"
-            graphs3d/qml/designer/Scatter3DSpecifics.qml
+        "graphs2d/data/tickershaderhorizontal.frag.qsb"
-            graphs3d/qml/designer/Surface3DSpecifics.qml
+        "graphs2d/data/tickershaderhorizontal.vert.qsb"
-            graphs3d/qml/designer/GraphsCameraSection.qml
+        "graphs2d/data/lineshaderhorizontal.frag.qsb"
-            graphs3d/qml/designer/GraphsSection.qml
+        "graphs2d/data/lineshaderhorizontal.vert.qsb"
-            graphs3d/qml/designer/default/Bars3D.qml
+        "graphs2d/data/lineshadervertical.frag.qsb"
-            graphs3d/qml/designer/default/Scatter3D.qml
+        "graphs2d/data/lineshadervertical.vert.qsb"
-            graphs3d/qml/designer/default/Surface3D.qml
+    )
-        )
 
-        set_source_files_properties(${qml_files} PROPERTIES
+    # 3D specific resources
-            QT_QML_SKIP_QMLDIR_ENTRY TRUE
+     set(qml_files
-        )
+        "graphs3d/qml/designer/Bars3DSpecifics.qml"
+        "graphs3d/qml/designer/Scatter3DSpecifics.qml"
+        "graphs3d/qml/designer/Surface3DSpecifics.qml"
+        "graphs3d/qml/designer/GraphsCameraSection.qml"
+        "graphs3d/qml/designer/GraphsSection.qml"
+        "graphs3d/qml/designer/default/Bars3D.qml"
+        "graphs3d/qml/designer/default/Scatter3D.qml"
+        "graphs3d/qml/designer/default/Surface3D.qml"
+    )
 
+    set_source_files_properties(${qml_files} PROPERTIES
+        QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    )
+
+    set(qml_component_resources
+        "graphs3d/qml/resources/DatapointSphere.qml"
+        "graphs3d/qml/resources/DatapointCube.qml"
+    )
+
+    foreach(file IN LISTS qml_component_resources)
+        get_filename_component(filename ${file} NAME)
+        set(RESOURCE_NAME ${filename})
+        string(REPLACE ".qml" "" RESOURCE_NAME ${RESOURCE_NAME})
+        set_source_files_properties(${file} PROPERTIES QT_RESOURCE_ALIAS ${RESOURCE_NAME})
+    endforeach()
+
+    set(qml_axis_resources
+        "graphs3d/qml/resources/AxisLabel.qml"
+        "graphs3d/qml/resources/GridLine.qml"
+        "graphs3d/qml/resources/ItemLabel.qml"
+        "graphs3d/qml/resources/TitleLabel.qml"
+    )
+
+    foreach(file IN LISTS qml_axis_resources)
+        get_filename_component(filename ${file} NAME)
+        set(RESOURCE_NAME ${filename})
+        string(REPLACE ".qml" "" RESOURCE_NAME ${RESOURCE_NAME})
+        set_source_files_properties(${file} PROPERTIES QT_RESOURCE_ALIAS ${RESOURCE_NAME})
+    endforeach()
+
+    set(qml_material_resources
+        "graphs3d/qml/resources/ObjectGradientMaterial.qml"
+        "graphs3d/qml/resources/ObjectGradientMaterialInstancing.qml"
+        "graphs3d/qml/resources/BarsMaterial.qml"
+        "graphs3d/qml/resources/BarsMaterialInstancing.qml"
+        "graphs3d/qml/resources/SurfaceMaterial.qml"
+        "graphs3d/qml/resources/ScatterMaterial.qml"
+        "graphs3d/qml/resources/ScatterMaterialInstancing.qml"
+        "graphs3d/qml/resources/GridSurfaceMaterial.qml"
+        "graphs3d/qml/resources/SurfaceSliceMaterial.qml"
+        "graphs3d/qml/resources/SurfaceShadowNoTex.qml"
+        "graphs3d/qml/resources/VolumeMaterial.qml"
+        "graphs3d/qml/resources/VolumeLowDefMaterial.qml"
+        "graphs3d/qml/resources/VolumeSliceMaterial.qml"
+        "graphs3d/qml/resources/VolumeFrameMaterial.qml"
+    )
+
+    foreach(file IN LISTS qml_material_resources)
+        get_filename_component(filename ${file} NAME)
+        set(RESOURCE_NAME ${filename})
+        string(REPLACE ".qml" "" RESOURCE_NAME ${RESOURCE_NAME})
+        set_source_files_properties(${file} PROPERTIES QT_RESOURCE_ALIAS ${RESOURCE_NAME})
+    endforeach()
+
+    set(resources
+        "graphs2d/qml/designer/Graphs.metainfo"
+        "graphs2d/qml/designer/images/bars3d-icon.png"
+        "graphs2d/qml/designer/images/bars3d-icon16.png"
+        "graphs2d/qml/designer/images/scatter3d-icon.png"
+        "graphs2d/qml/designer/images/scatter3d-icon16.png"
+        "graphs2d/qml/designer/images/surface3d-icon.png"
+        "graphs2d/qml/designer/images/surface3d-icon16.png"
+    )
+
+    set(mesh_resource_files
+        "graphs3d/engine/meshes/backgroundMesh.mesh"
+        "graphs3d/engine/meshes/backgroundNoFloorMesh.mesh"
+        "graphs3d/engine/meshes/arrowMesh.mesh"
+        "graphs3d/engine/meshes/arrowMeshSmooth.mesh"
+        "graphs3d/engine/meshes/bevelBarMeshFull.mesh"
+        "graphs3d/engine/meshes/bevelBarMeshSmoothFull.mesh"
+        "graphs3d/engine/meshes/bevelBarMesh.mesh"
+        "graphs3d/engine/meshes/bevelBarMeshSmooth.mesh"
+        "graphs3d/engine/meshes/coneMeshFull.mesh"
+        "graphs3d/engine/meshes/coneMeshSmoothFull.mesh"
+        "graphs3d/engine/meshes/coneMesh.mesh"
+        "graphs3d/engine/meshes/coneMeshSmooth.mesh"
+        "graphs3d/engine/meshes/barMeshFull.mesh"
+        "graphs3d/engine/meshes/barMeshSmoothFull.mesh"
+        "graphs3d/engine/meshes/barMesh.mesh"
+        "graphs3d/engine/meshes/barMeshSmooth.mesh"
+        "graphs3d/engine/meshes/cylinderMeshFull.mesh"
+        "graphs3d/engine/meshes/cylinderMeshSmoothFull.mesh"
+        "graphs3d/engine/meshes/cylinderMesh.mesh"
+        "graphs3d/engine/meshes/cylinderMeshSmooth.mesh"
+        "graphs3d/engine/meshes/minimalMesh.mesh"
+        "graphs3d/engine/meshes/minimalMeshSmooth.mesh"
+        "graphs3d/engine/meshes/planeMesh.mesh"
+        "graphs3d/engine/meshes/pyramidMeshFull.mesh"
+        "graphs3d/engine/meshes/pyramidMeshSmoothFull.mesh"
+        "graphs3d/engine/meshes/pyramidMesh.mesh"
+        "graphs3d/engine/meshes/pyramidMeshSmooth.mesh"
+        "graphs3d/engine/meshes/octagonMesh.mesh"
+        "graphs3d/engine/meshes/sphereMesh.mesh"
+        "graphs3d/engine/meshes/sphereMeshSmooth.mesh"
+    )
+
+    foreach(file IN LISTS mesh_resource_files)
+        get_filename_component(filename ${file} NAME)
+        set(RESOURCE_NAME ${filename})
+        string(REPLACE ".mesh" "" RESOURCE_NAME ${RESOURCE_NAME})
+        set_source_files_properties(${file} PROPERTIES QT_RESOURCE_ALIAS ${RESOURCE_NAME})
+    endforeach()
+
+    set(shader_resource_files
+        "graphs3d/engine/shaders/3dsliceframes.frag"
+        "graphs3d/engine/shaders/position.vert"
+        "graphs3d/engine/shaders/objectgradient.vert"
+        "graphs3d/engine/shaders/objectgradient.frag"
+        "graphs3d/engine/shaders/objectgradientinstancing.vert"
+        "graphs3d/engine/shaders/objectgradientinstancing.frag"
+        "graphs3d/engine/shaders/rangegradient.frag"
+        "graphs3d/engine/shaders/rangegradientinstancing.frag"
+        "graphs3d/engine/shaders/surface.vert"
+        "graphs3d/engine/shaders/surface.frag"
+        "graphs3d/engine/shaders/surfaceGrid.vert"
+        "graphs3d/engine/shaders/surfaceGrid.frag"
+        "graphs3d/engine/shaders/bars.frag"
+        "graphs3d/engine/shaders/barsinstancing.vert"
+        "graphs3d/engine/shaders/barsinstancing.frag"
+        "graphs3d/engine/shaders/scatter.vert"
+        "graphs3d/engine/shaders/scatter.frag"
+        "graphs3d/engine/shaders/scatterinstancing.vert"
+        "graphs3d/engine/shaders/scatterinstancing.frag"
+        "graphs3d/engine/shaders/surfaceSlice.vert"
+        "graphs3d/engine/shaders/texture3d.frag"
+        "graphs3d/engine/shaders/texture3d.vert"
+        "graphs3d/engine/shaders/texture3dlowdef.frag"
+        "graphs3d/engine/shaders/texture3dslice.frag"
+    )
+
+    foreach(file IN LISTS shader_resource_files)
+        get_filename_component(filename ${file} NAME)
+        set(RESOURCE_NAME ${filename})
+        string(REPLACE "." "" RESOURCE_NAME ${RESOURCE_NAME})
+        set_source_files_properties(${file} PROPERTIES QT_RESOURCE_ALIAS ${RESOURCE_NAME})
+    endforeach()
+
+    # First check if both 2D and 3D are enabled. If it is, we must add dependencies to
+    # both (i.e. QtQuick3D, Quick3DPrivate, Quick3DRuntimeRenderPrivate,
+    # QtQuickPrivate, and QtQuickShapesPrivate).
+    if(QT_FEATURE_graphs_3d AND QT_FEATURE_graphs_2d)
         qt_internal_add_qml_module(Graphs
             URI "QtGraphs"
             TARGET_PRODUCT "Qt Graphs (Qt $$QT_VERSION)"
@@ -61,365 +210,6 @@ else()
         )
 
         # CMake 3.16 forces these to be added here instead of the graphs3d folder
-        # TODO: Create a branch that has 3D -only, to avoid including these
-        set(shader_resource_files_2D
-            "graphs2d/data/gridshader.frag.qsb"
-            "graphs2d/data/gridshader.vert.qsb"
-            "graphs2d/data/tickershader.frag.qsb"
-            "graphs2d/data/tickershader.vert.qsb"
-            "graphs2d/data/tickershaderhorizontal.frag.qsb"
-            "graphs2d/data/tickershaderhorizontal.vert.qsb"
-            "graphs2d/data/lineshaderhorizontal.frag.qsb"
-            "graphs2d/data/lineshaderhorizontal.vert.qsb"
-            "graphs2d/data/lineshadervertical.frag.qsb"
-            "graphs2d/data/lineshadervertical.vert.qsb"
-        )
-
-        # TODO: Create a branch that has 3D -only, to avoid including these
-        qt_internal_add_resource(Graphs "graphsshaders2D"
-            PREFIX
-                "/shaders"
-            BASE
-                "graphs2d/data"
-            FILES
-                ${shader_resource_files_2D}
-        )
-
-        set_source_files_properties("graphs3d/qml/resources/DatapointSphere.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "DatapointSphere"
-        )
-
-        set_source_files_properties("graphs3d/qml/resources/DatapointCube.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "DatapointCube"
-        )
-
-        set_source_files_properties("graphs3d/qml/resources/AxisLabel.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "AxisLabel"
-        )
-
-        set_source_files_properties("graphs3d/qml/resources/GridLine.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "GridLine"
-        )
-
-        set_source_files_properties("graphs3d/qml/resources/ItemLabel.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "ItemLabel"
-        )
-
-        set_source_files_properties("graphs3d/qml/resources/TitleLabel.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "TitleLabel"
-        )
-        set_source_files_properties("graphs3d/qml/resources/GridSurfaceMaterial.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "GridSurfaceMaterial"
-        )
-        set_source_files_properties("graphs3d/qml/resources/SurfaceSliceMaterial.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "SurfaceSliceMaterial"
-        )
-        set_source_files_properties("graphs3d/qml/resources/BarsMaterial.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "BarsMaterial"
-        )
-        set_source_files_properties("graphs3d/qml/resources/BarsMaterialInstancing.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "BarsMaterialInstancing"
-        )
-        set_source_files_properties("graphs3d/qml/resources/SurfaceMaterial.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "SurfaceMaterial"
-        )
-        set_source_files_properties("graphs3d/qml/resources/ScatterMaterial.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "ScatterMaterial"
-        )
-        set_source_files_properties("graphs3d/qml/resources/ScatterMaterialInstancing.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "ScatterMaterialInstancing"
-        )
-        set_source_files_properties("graphs3d/qml/resources/ObjectGradientMaterial.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "ObjectGradientMaterial"
-        )
-        set_source_files_properties("graphs3d/qml/resources/ObjectGradientMaterialInstancing.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "ObjectGradientMaterialInstancing"
-        )
-
-        set_source_files_properties("graphs3d/qml/resources/VolumeMaterial.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "VolumeMaterial"
-        )
-
-        set_source_files_properties("graphs3d/qml/resources/VolumeLowDefMaterial.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "VolumeLowDefMaterial"
-        )
-
-        set_source_files_properties("graphs3d/qml/resources/VolumeSliceMaterial.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "VolumeSliceMaterial"
-        )
-
-        set_source_files_properties("graphs3d/qml/resources/VolumeFrameMaterial.qml"
-            PROPERTIES QT_RESOURCE_ALIAS "VolumeFrameMaterial"
-        )
-
-        set(qml_component_resources
-            "graphs3d/qml/resources/DatapointSphere.qml"
-            "graphs3d/qml/resources/DatapointCube.qml"
-        )
-
-        set(qml_axis_resurces
-            "graphs3d/qml/resources/AxisLabel.qml"
-            "graphs3d/qml/resources/GridLine.qml"
-            "graphs3d/qml/resources/ItemLabel.qml"
-            "graphs3d/qml/resources/TitleLabel.qml"
-        )
-
-        set(qml_material_resources
-            "graphs3d/qml/resources/ObjectGradientMaterial.qml"
-            "graphs3d/qml/resources/ObjectGradientMaterialInstancing.qml"
-            "graphs3d/qml/resources/BarsMaterial.qml"
-            "graphs3d/qml/resources/BarsMaterialInstancing.qml"
-            "graphs3d/qml/resources/SurfaceMaterial.qml"
-            "graphs3d/qml/resources/ScatterMaterial.qml"
-            "graphs3d/qml/resources/ScatterMaterialInstancing.qml"
-            "graphs3d/qml/resources/GridSurfaceMaterial.qml"
-            "graphs3d/qml/resources/SurfaceSliceMaterial.qml"
-            "graphs3d/qml/resources/SurfaceShadowNoTex.qml"
-            "graphs3d/qml/resources/VolumeMaterial.qml"
-            "graphs3d/qml/resources/VolumeLowDefMaterial.qml"
-            "graphs3d/qml/resources/VolumeSliceMaterial.qml"
-            "graphs3d/qml/resources/VolumeFrameMaterial.qml"
-        )
-
-        set(resources
-            "graphs2d/qml/designer/Graphs.metainfo"
-            "graphs2d/qml/designer/images/bars3d-icon.png"
-            "graphs2d/qml/designer/images/bars3d-icon16.png"
-            "graphs2d/qml/designer/images/scatter3d-icon.png"
-            "graphs2d/qml/designer/images/scatter3d-icon16.png"
-            "graphs2d/qml/designer/images/surface3d-icon.png"
-            "graphs2d/qml/designer/images/surface3d-icon16.png"
-        )
-
-        # .mesh file aliases
-        set_source_files_properties("graphs3d/engine/meshes/arrowFlat.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "arrowMesh"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/arrowSmooth.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "arrowMeshSmooth"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/background.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "backgroundMesh"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/barFilledFlat.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "bevelBarMeshFull"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/barFilledSmooth.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "bevelBarMeshSmoothFull"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/barFlat.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "bevelBarMesh"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/barSmooth.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "bevelBarMeshSmooth"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/cubeFilledFlat.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "barMeshFull"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/cubeFilledSmooth.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "barMeshSmoothFull"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/cubeFlat.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "barMesh"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/cubeSmooth.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "barMeshSmooth"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/coneFilledFlat.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "coneMeshFull"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/coneFilledSmooth.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "coneMeshSmoothFull"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/coneFlat.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "coneMesh"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/coneSmooth.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "coneMeshSmooth"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/cylinderFilledFlat.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "cylinderMeshFull"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/cylinderFilledSmooth.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "cylinderMeshSmoothFull"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/cylinderFlat.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "cylinderMesh"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/cylinderSmooth.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "cylinderMeshSmooth"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/minimalFlat.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "minimalMesh"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/minimalSmooth.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "minimalMeshSmooth"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/plane.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "planeMesh"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/pyramidFilledFlat.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "pyramidMeshFull"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/pyramidFilledSmooth.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "pyramidMeshSmoothFull"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/pyramidFlat.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "pyramidMesh"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/pyramidSmooth.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "pyramidMeshSmooth"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/octagon.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "octagonMesh"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/sphere.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "sphereMesh"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/sphereSmooth.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "sphereMeshSmooth"
-        )
-        set_source_files_properties("graphs3d/engine/meshes/backgroundNoFloor.mesh"
-            PROPERTIES QT_RESOURCE_ALIAS "backgroundNoFloorMesh"
-        )
-        set(mesh_resource_files
-            # .mesh files
-            "graphs3d/engine/meshes/background.mesh"
-            "graphs3d/engine/meshes/arrowFlat.mesh"
-            "graphs3d/engine/meshes/arrowSmooth.mesh"
-            "graphs3d/engine/meshes/barFilledFlat.mesh"
-            "graphs3d/engine/meshes/barFilledSmooth.mesh"
-            "graphs3d/engine/meshes/barFlat.mesh"
-            "graphs3d/engine/meshes/barSmooth.mesh"
-            "graphs3d/engine/meshes/coneFilledFlat.mesh"
-            "graphs3d/engine/meshes/coneFilledSmooth.mesh"
-            "graphs3d/engine/meshes/coneFlat.mesh"
-            "graphs3d/engine/meshes/coneSmooth.mesh"
-            "graphs3d/engine/meshes/cubeFilledFlat.mesh"
-            "graphs3d/engine/meshes/cubeFilledSmooth.mesh"
-            "graphs3d/engine/meshes/cubeFlat.mesh"
-            "graphs3d/engine/meshes/cubeSmooth.mesh"
-            "graphs3d/engine/meshes/cylinderFilledFlat.mesh"
-            "graphs3d/engine/meshes/cylinderFilledSmooth.mesh"
-            "graphs3d/engine/meshes/cylinderFlat.mesh"
-            "graphs3d/engine/meshes/cylinderSmooth.mesh"
-            "graphs3d/engine/meshes/minimalFlat.mesh"
-            "graphs3d/engine/meshes/minimalSmooth.mesh"
-            "graphs3d/engine/meshes/plane.mesh"
-            "graphs3d/engine/meshes/pyramidFilledFlat.mesh"
-            "graphs3d/engine/meshes/pyramidFilledSmooth.mesh"
-            "graphs3d/engine/meshes/pyramidFlat.mesh"
-            "graphs3d/engine/meshes/pyramidSmooth.mesh"
-            "graphs3d/engine/meshes/octagon.mesh"
-            "graphs3d/engine/meshes/sphere.mesh"
-            "graphs3d/engine/meshes/sphereSmooth.mesh"
-            "graphs3d/engine/meshes/backgroundNoFloor.mesh"
-        )
-
-        set_source_files_properties("graphs3d/engine/shaders/3dsliceframes.frag"
-            PROPERTIES QT_RESOURCE_ALIAS "fragment3DSliceFrames"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/position.vert"
-            PROPERTIES QT_RESOURCE_ALIAS "vertexPosition"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/bars.frag"
-            PROPERTIES QT_RESOURCE_ALIAS "fragmentBars"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/barsinstancing.frag"
-            PROPERTIES QT_RESOURCE_ALIAS "fragmentBarsInstancing"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/barsinstancing.vert"
-            PROPERTIES QT_RESOURCE_ALIAS "vertexBarsInstancing"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/surface.frag"
-            PROPERTIES QT_RESOURCE_ALIAS "fragmentSurface"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/surface.vert"
-            PROPERTIES QT_RESOURCE_ALIAS "vertexSurface"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/scatter.vert"
-            PROPERTIES QT_RESOURCE_ALIAS "vertexScatter"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/scatter.frag"
-            PROPERTIES QT_RESOURCE_ALIAS "fragmentScatter"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/scatterinstancing.vert"
-            PROPERTIES QT_RESOURCE_ALIAS "vertexScatterInstancing"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/scatterinstancing.frag"
-            PROPERTIES QT_RESOURCE_ALIAS "fragmentScatterInstancing"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/surfaceGrid.frag"
-            PROPERTIES QT_RESOURCE_ALIAS "fragSurfaceGrid"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/surfaceGrid.vert"
-            PROPERTIES QT_RESOURCE_ALIAS "vertexSurfaceGrid"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/surfaceSlice.vert"
-            PROPERTIES QT_RESOURCE_ALIAS "vertexSurfaceSlice"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/texture3d.frag"
-            PROPERTIES QT_RESOURCE_ALIAS "fragmentTexture3D"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/texture3d.vert"
-            PROPERTIES QT_RESOURCE_ALIAS "vertexTexture3D"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/texture3dlowdef.frag"
-            PROPERTIES QT_RESOURCE_ALIAS "fragmentTexture3DLowDef"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/texture3dslice.frag"
-            PROPERTIES QT_RESOURCE_ALIAS "fragmentTexture3DSlice"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/objectgradient.vert"
-            PROPERTIES QT_RESOURCE_ALIAS "vertexobjectgradient"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/objectgradient.frag"
-            PROPERTIES QT_RESOURCE_ALIAS "fragmentobjectgradient"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/objectgradientinstancing.vert"
-            PROPERTIES QT_RESOURCE_ALIAS "vertexobjectgradientinstancing"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/objectgradientinstancing.frag"
-            PROPERTIES QT_RESOURCE_ALIAS "fragmentobjectgradientinstancing"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/rangegradient.vert"
-            PROPERTIES QT_RESOURCE_ALIAS "vertexrangegradient"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/rangegradient.frag"
-            PROPERTIES QT_RESOURCE_ALIAS "fragmentrangegradient"
-        )
-        set_source_files_properties("graphs3d/engine/shaders/rangegradientinstancing.vert"
-            PROPERTIES QT_RESOURCE_ALIAS "vertexrangegradientinstancing"
-        )
-        set(shader_resource_files
-            "graphs3d/engine/shaders/3dsliceframes.frag"
-            "graphs3d/engine/shaders/position.vert"
-            "graphs3d/engine/shaders/objectgradient.vert"
-            "graphs3d/engine/shaders/objectgradient.frag"
-            "graphs3d/engine/shaders/objectgradientinstancing.vert"
-            "graphs3d/engine/shaders/objectgradientinstancing.frag"
-            "graphs3d/engine/shaders/rangegradient.vert"
-            "graphs3d/engine/shaders/rangegradient.frag"
-            "graphs3d/engine/shaders/rangegradientinstancing.frag"
-            "graphs3d/engine/shaders/rangegradientinstancing.vert"
-            "graphs3d/engine/shaders/surface.vert"
-            "graphs3d/engine/shaders/surface.frag"
-            "graphs3d/engine/shaders/surfaceGrid.vert"
-            "graphs3d/engine/shaders/surfaceGrid.frag"
-            "graphs3d/engine/shaders/bars.frag"
-            "graphs3d/engine/shaders/barsinstancing.vert"
-            "graphs3d/engine/shaders/barsinstancing.frag"
-            "graphs3d/engine/shaders/scatter.vert"
-            "graphs3d/engine/shaders/scatter.frag"
-            "graphs3d/engine/shaders/scatterinstancing.vert"
-            "graphs3d/engine/shaders/scatterinstancing.frag"
-            "graphs3d/engine/shaders/surfaceSlice.vert"
-            "graphs3d/engine/shaders/texture3d.frag"
-            "graphs3d/engine/shaders/texture3d.vert"
-            "graphs3d/engine/shaders/texture3dlowdef.frag"
-            "graphs3d/engine/shaders/texture3dslice.frag"
-        )
-
         qt_internal_add_resource(Graphs "graphsshaders"
             PREFIX
                 "/shaders"
@@ -448,13 +238,13 @@ else()
                 ${qml_component_resources}
         )
 
-        qt_internal_add_resource(Graphs "qml_axis_resurces"
+        qt_internal_add_resource(Graphs "qml_axis_resources"
             PREFIX
                 "/axis"
             BASE
                 "graphs3d/qml"
             FILES
-                ${qml_axis_resurces}
+                ${qml_axis_resources}
         )
 
         qt_internal_add_resource(Graphs "qml_material_resources"
@@ -465,49 +255,111 @@ else()
             FILES
                 ${qml_material_resources}
         )
-    else(QT_FEATURE_graphs_2d)
+    else()
-        qt_internal_add_qml_module(Graphs
+        if(QT_FEATURE_graphs_3d)
-            URI "QtGraphs"
+            qt_internal_add_qml_module(Graphs
-            TARGET_PRODUCT "Qt Graphs (Qt $$QT_VERSION)"
+                URI "QtGraphs"
-            TARGET_DESCRIPTION "Qt Graphs Visualization component for Qt."
+                TARGET_PRODUCT "Qt Graphs (Qt $$QT_VERSION)"
-            VERSION "${PROJECT_VERSION}"
+                TARGET_DESCRIPTION "Qt Graphs Visualization component for Qt."
-            PAST_MAJOR_VERSIONS 1
+                VERSION "${PROJECT_VERSION}"
-            DEPENDENCIES
+                PAST_MAJOR_VERSIONS 1
-                QtQuick
+                DEPENDENCIES
-                QtQuickPrivate
+                    QtQuick
-            LIBRARIES
+                    QtQuick3D
-                Qt::QuickPrivate
+                QML_FILES
-                Qt::QuickShapesPrivate
+                    ${qml_files}
-            PUBLIC_LIBRARIES
+                LIBRARIES
-                Qt::Core
+                    Qt::Quick3DPrivate
-                Qt::Gui
+                    Qt::Quick3DRuntimeRenderPrivate
-                Qt::Quick
+                PUBLIC_LIBRARIES
-            GENERATE_CPP_EXPORTS
+                    Qt::Core
-        )
+                    Qt::Gui
+                    Qt::Quick
+                    Qt::QuickWidgets
+                    Qt::Quick3D
+                PRIVATE_MODULE_INTERFACE
+                    Qt::Quick3DPrivate
+                    Qt::Quick3DRuntimeRenderPrivate
+                GENERATE_CPP_EXPORTS
+            )
 
-        # CMake 3.16 forces these to be added here instead of the graphs2d folder
+            # CMake 3.16 forces these to be added here instead of the graphs3d folder
-        set(shader_resource_files_2D
+            qt_internal_add_resource(Graphs "graphsshaders"
-            "graphs2d/data/gridshader.frag.qsb"
+                PREFIX
-            "graphs2d/data/gridshader.vert.qsb"
+                    "/shaders"
-            "graphs2d/data/tickershader.frag.qsb"
+                BASE
-            "graphs2d/data/tickershader.vert.qsb"
+                    "graphs3d/engine/shaders"
-            "graphs2d/data/tickershaderhorizontal.frag.qsb"
+                FILES
-            "graphs2d/data/tickershaderhorizontal.vert.qsb"
+                    ${shader_resource_files}
-            "graphs2d/data/lineshaderhorizontal.frag.qsb"
+            )
-            "graphs2d/data/lineshaderhorizontal.vert.qsb"
-            "graphs2d/data/lineshadervertical.frag.qsb"
-            "graphs2d/data/lineshadervertical.vert.qsb"
-        )
 
-        qt_internal_add_resource(Graphs "graphsshaders2D"
+            qt_internal_add_resource(Graphs "graphsmeshes"
-            PREFIX
+                PREFIX
-                "/shaders"
+                    "/defaultMeshes"
-            BASE
+                BASE
-                "graphs2d/data"
+                    "graphs3d/engine/meshes"
-            FILES
+                FILES
-                ${shader_resource_files_2D}
+                    ${mesh_resource_files}
-        )
+                    ${obj_resource_files}
-    endif()
+            )
+
+            qt_internal_add_resource(Graphs "qml_component_resources"
+                PREFIX
+                    "/datapointModels"
+                BASE
+                    "graphs3d/qml"
+                FILES
+                    ${qml_component_resources}
+            )
+
+            qt_internal_add_resource(Graphs "qml_axis_resources"
+                PREFIX
+                    "/axis"
+                BASE
+                    "graphs3d/qml"
+                FILES
+                    ${qml_axis_resources}
+            )
+
+            qt_internal_add_resource(Graphs "qml_material_resources"
+                PREFIX
+                    "/materials"
+                BASE
+                    "graphs3d/qml"
+                FILES
+                    ${qml_material_resources}
+            )
+        else(QT_FEATURE_graphs_2d)
+            qt_internal_add_qml_module(Graphs
+                URI "QtGraphs"
+                TARGET_PRODUCT "Qt Graphs (Qt $$QT_VERSION)"
+                TARGET_DESCRIPTION "Qt Graphs Visualization component for Qt."
+                VERSION "${PROJECT_VERSION}"
+                PAST_MAJOR_VERSIONS 1
+                DEPENDENCIES
+                    QtQuick
+                    QtQuickPrivate
+                LIBRARIES
+                    Qt::QuickPrivate
+                    Qt::QuickShapesPrivate
+                PUBLIC_LIBRARIES
+                    Qt::Core
+                    Qt::Gui
+                    Qt::Quick
+                GENERATE_CPP_EXPORTS
+            )
+
+            # CMake 3.16 forces these to be added here instead of the graphs2d folder
+             qt_internal_add_resource(Graphs "graphsshaders2D"
+                PREFIX
+                    "/shaders"
+                BASE
+                    "graphs2d/data"
+                FILES
+                    ${shader_resource_files_2D}
+            )
+        endif()
+    endif() # if(QT_FEATURE_graphs_3d AND QT_FEATURE_graphs_2d)
 endif()
 
 qt_configure_add_summary_section(NAME "Qt Graphs Support")

src/graphs3d/engine/shaders/rangegradient.vert

@@ -1,4 +0,0 @@
-void MAIN()
-{
-    POSITION = MODELVIEWPROJECTION_MATRIX * vec4(VERTEX, 1.0);
-}

src/graphs3d/engine/shaders/rangegradientinstancing.vert

@@ -1,4 +0,0 @@
-void MAIN()
-{
-    POSITION = INSTANCE_MODELVIEWPROJECTION_MATRIX * vec4(VERTEX, 1.0);
-}

src/graphs3d/qml/resources/BarsMaterial.qml

@@ -13,6 +13,6 @@ CustomMaterial {
     readonly property real shininess: (1.0 - specularBrightness) * 100
 
     shadingMode: CustomMaterial.Shaded
-    vertexShader: "qrc:/shaders/vertexobjectgradient"
+    vertexShader: "qrc:/shaders/objectgradientvert"
-    fragmentShader: "qrc:/shaders/fragmentBars"
+    fragmentShader: "qrc:/shaders/barsfrag"
 }

src/graphs3d/qml/resources/BarsMaterialInstancing.qml

@@ -14,6 +14,6 @@ CustomMaterial {
     readonly property real shininess: (1.0 - specularBrightness) * 100
 
     shadingMode: CustomMaterial.Shaded
-    vertexShader: "qrc:/shaders/vertexBarsInstancing"
+    vertexShader: "qrc:/shaders/barsinstancingvert"
-    fragmentShader: "qrc:/shaders/fragmentBarsInstancing"
+    fragmentShader: "qrc:/shaders/barsinstancingfrag"
 }

src/graphs3d/qml/resources/GridSurfaceMaterial.qml

@@ -11,6 +11,6 @@ CustomMaterial {
     property vector2d vertices
     property vector2d range
 
-    vertexShader: "qrc:/shaders/vertexSurfaceGrid"
+    vertexShader: "qrc:/shaders/surfaceGridvert"
-    fragmentShader: "qrc:/shaders/fragSurfaceGrid"
+    fragmentShader: "qrc:/shaders/surfaceGridfrag"
 }

src/graphs3d/qml/resources/ObjectGradientMaterial.qml

@@ -8,6 +8,6 @@ CustomMaterial {
     property TextureInput custex: TextureInput {}
 
     shadingMode: CustomMaterial.Shaded
-    vertexShader: "qrc:/shaders/vertexobjectgradient"
+    vertexShader: "qrc:/shaders/objectgradientvert"
-    fragmentShader: "qrc:/shaders/fragmentobjectgradient"
+    fragmentShader: "qrc:/shaders/objectgradientfrag"
 }

src/graphs3d/qml/resources/ObjectGradientMaterialInstancing.qml

@@ -8,6 +8,6 @@ CustomMaterial {
     property TextureInput custex: TextureInput {}
 
     shadingMode: CustomMaterial.Shaded
-    fragmentShader: "qrc:/shaders/fragmentobjectgradientinstancing"
+    fragmentShader: "qrc:/shaders/objectgradientinstancingfrag"
-    vertexShader: "qrc:/shaders/vertexobjectgradientinstancing"
+    vertexShader: "qrc:/shaders/objectgradientinstancingvert"
 }

src/graphs3d/qml/resources/ScatterMaterial.qml

@@ -15,6 +15,6 @@ CustomMaterial {
     readonly property real shininess: (1.0 - specularBrightness) * 100
 
     shadingMode: CustomMaterial.Shaded
-    vertexShader: "qrc:/shaders/vertexScatter"
+    vertexShader: "qrc:/shaders/scattervert"
-    fragmentShader: "qrc:/shaders/fragmentScatter"
+    fragmentShader: "qrc:/shaders/scatterfrag"
 }

src/graphs3d/qml/resources/ScatterMaterialInstancing.qml

@@ -15,6 +15,6 @@ CustomMaterial {
     readonly property real shininess: (1.0 - specularBrightness) * 100
 
     shadingMode: CustomMaterial.Shaded
-    vertexShader: "qrc:/shaders/vertexScatterInstancing"
+    vertexShader: "qrc:/shaders/scatterinstancingvert"
-    fragmentShader: "qrc:/shaders/fragmentScatterInstancing"
+    fragmentShader: "qrc:/shaders/scatterinstancingfrag"
 }

src/graphs3d/qml/resources/SurfaceMaterial.qml

@@ -25,6 +25,6 @@ CustomMaterial {
     readonly property real shininess: (1.0 - specularBrightness) * 100
 
     shadingMode: CustomMaterial.Shaded
-    vertexShader: "qrc:/shaders/vertexSurface"
+    vertexShader: "qrc:/shaders/surfacevert"
-    fragmentShader: "qrc:/shaders/fragmentSurface"
+    fragmentShader: "qrc:/shaders/surfacefrag"
 }

src/graphs3d/qml/resources/SurfaceSliceMaterial.qml

@@ -9,6 +9,6 @@ CustomMaterial {
     property TextureInput custex: TextureInput {}
 
     shadingMode: CustomMaterial.Shaded
-    vertexShader: "qrc:/shaders/vertexSurfaceSlice"
+    vertexShader: "qrc:/shaders/surfaceSlicevert"
-    fragmentShader: "qrc:/shaders/fragmentrangegradient"
+    fragmentShader: "qrc:/shaders/rangegradientfrag"
 }

src/graphs3d/qml/resources/VolumeFrameMaterial.qml

@@ -11,6 +11,6 @@ CustomMaterial {
     shadingMode: CustomMaterial.Unshaded
     sourceBlend: CustomMaterial.SrcAlpha
     destinationBlend: CustomMaterial.OneMinusSrcAlpha
-    vertexShader: "qrc:/shaders/vertexPosition"
+    vertexShader: "qrc:/shaders/positionvert"
-    fragmentShader: "qrc:/shaders/fragment3DSliceFrames"
+    fragmentShader: "qrc:/shaders/3dsliceframesfrag"
 }

src/graphs3d/qml/resources/VolumeLowDefMaterial.qml

@@ -19,6 +19,6 @@ CustomMaterial {
     shadingMode: CustomMaterial.Unshaded
     sourceBlend: CustomMaterial.SrcAlpha
     destinationBlend: CustomMaterial.OneMinusSrcAlpha
-    vertexShader: "qrc:/shaders/vertexTexture3D"
+    vertexShader: "qrc:/shaders/texture3dvert"
-    fragmentShader: "qrc:/shaders/fragmentTexture3DLowDef"
+    fragmentShader: "qrc:/shaders/texture3dlowdeffrag"
 }

src/graphs3d/qml/resources/VolumeMaterial.qml

@@ -19,6 +19,6 @@ CustomMaterial {
     shadingMode: CustomMaterial.Unshaded
     sourceBlend: CustomMaterial.SrcAlpha
     destinationBlend: CustomMaterial.OneMinusSrcAlpha
-    vertexShader: "qrc:/shaders/vertexTexture3D"
+    vertexShader: "qrc:/shaders/texture3dvert"
-    fragmentShader: "qrc:/shaders/fragmentTexture3D"
+    fragmentShader: "qrc:/shaders/texture3dfrag"
 }

src/graphs3d/qml/resources/VolumeSliceMaterial.qml

@@ -20,6 +20,6 @@ CustomMaterial {
     shadingMode: CustomMaterial.Unshaded
     sourceBlend: CustomMaterial.SrcAlpha
     destinationBlend: CustomMaterial.OneMinusSrcAlpha
-    vertexShader: "qrc:/shaders/vertexTexture3D"
+    vertexShader: "qrc:/shaders/texture3dvert"
-    fragmentShader: "qrc:/shaders/fragmentTexture3DSlice"
+    fragmentShader: "qrc:/shaders/texture3dslicefrag"
 }