From 60542fd8eebb63d38c676c918703f2f97f9ef3d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Fri, 5 Jan 2024 17:08:57 +0100 Subject: [PATCH] Re-establish common examples/graphs dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qdoc expects a common installation directory for all examples in a documentation project. Fixes: QTBUG-120562 Pick-to: 6.7 Change-Id: Iafcc3b1867e62179aabe991e6d4013dafaf61678 Reviewed-by: Tomi Korpipää --- examples/CMakeLists.txt | 4 ++-- examples/examples.pro | 4 ++-- .../{graphs2d/graphs2d.pro => graphs/2d/2d.pro} | 0 examples/{graphs2d => graphs/2d}/CMakeLists.txt | 0 examples/{graphs2d => graphs/2d}/examples.pri | 0 .../{graphs2d => graphs/2d}/testbed/CMakeLists.txt | 0 .../2d}/testbed/custombarseries.cpp | 0 .../2d}/testbed/custombarseries.h | 0 examples/{graphs2d => graphs/2d}/testbed/main.cpp | 0 .../2d}/testbed/qml/testbed/AxisGridSetup.qml | 0 .../2d}/testbed/qml/testbed/BarSelection.qml | 0 .../2d}/testbed/qml/testbed/BarThemes.qml | 0 .../2d}/testbed/qml/testbed/Callout.qml | 0 .../2d}/testbed/qml/testbed/CppBarSeries.qml | 0 .../2d}/testbed/qml/testbed/CustomCheckBox.qml | 0 .../2d}/testbed/qml/testbed/CustomLabel.qml | 0 .../2d}/testbed/qml/testbed/CustomSelectionBox.qml | 0 .../2d}/testbed/qml/testbed/CustomSlider.qml | 0 .../2d}/testbed/qml/testbed/LineProperties.qml | 0 .../2d}/testbed/qml/testbed/ScatterProperties.qml | 0 .../2d}/testbed/qml/testbed/SettingsView.qml | 0 .../2d}/testbed/qml/testbed/StartupView.qml | 0 .../2d}/testbed/qml/testbed/images/arrow_icon.png | Bin .../2d}/testbed/qml/testbed/images/happy_box.png | Bin .../testbed/qml/testbed/images/icon_settings.png | Bin .../2d}/testbed/qml/testbed/main.qml | 0 .../{graphs2d => graphs/2d}/testbed/testbed.pro | 0 .../{graphs2d => graphs/2d}/testbed/testbed.qrc | 0 .../{graphs3d/graphs3d.pro => graphs/3d/3d.pro} | 0 examples/{graphs3d => graphs/3d}/CMakeLists.txt | 0 .../3d}/axishandling/CMakeLists.txt | 0 .../3d}/axishandling/axishandling.pro | 0 .../3d}/axishandling/axishandling.qrc | 0 .../3d}/axishandling/customformatter.cpp | 0 .../3d}/axishandling/customformatter.h | 0 .../doc/images/axishandling-example.png | Bin .../3d}/axishandling/doc/src/axishandling.qdoc | 2 +- .../{graphs3d => graphs/3d}/axishandling/main.cpp | 0 .../axishandling/qml/axishandling/AxisDragging.qml | 0 .../qml/axishandling/AxisFormatting.qml | 0 .../3d}/axishandling/qml/axishandling/Data.qml | 0 .../3d}/axishandling/qml/axishandling/cube.mesh | Bin .../axishandling/qml/axishandling/cubetexture.png | Bin .../3d}/axishandling/qml/axishandling/main.qml | 0 .../{graphs3d => graphs/3d}/axishandling/qmldir | 0 .../{graphs3d => graphs/3d}/bars/CMakeLists.txt | 0 examples/{graphs3d => graphs/3d}/bars/bars.pro | 0 examples/{graphs3d => graphs/3d}/bars/bars.qrc | 0 .../3d}/bars/doc/images/bars-example.png | Bin .../{graphs3d => graphs/3d}/bars/doc/src/bars.qdoc | 2 +- examples/{graphs3d => graphs/3d}/bars/main.cpp | 0 .../{graphs3d => graphs/3d}/bars/qml/bars/Axes.qml | 0 .../{graphs3d => graphs/3d}/bars/qml/bars/Data.qml | 0 .../{graphs3d => graphs/3d}/bars/qml/bars/main.qml | 0 examples/{graphs3d => graphs/3d}/examples.pri | 0 .../{graphs3d => graphs/3d}/scatter/CMakeLists.txt | 0 .../3d}/scatter/doc/images/scatter-example.png | Bin .../3d}/scatter/doc/src/scatter.qdoc | 2 +- .../3d}/scatter/images/background.svg | 0 .../3d}/scatter/images/background_hide.svg | 0 .../3d}/scatter/images/camera.svg | 0 .../3d}/scatter/images/camera2.svg | 0 .../3d}/scatter/images/flatten.svg | 0 .../3d}/scatter/images/shadow.svg | 0 .../3d}/scatter/images/shadow_hide.svg | 0 .../3d}/scatter/images/smooth_curve.svg | 0 .../3d}/scatter/images/theme.svg | 0 examples/{graphs3d => graphs/3d}/scatter/main.cpp | 0 .../3d}/scatter/qml/scatter/Data.qml | 0 .../3d}/scatter/qml/scatter/Graph.qml | 0 .../3d}/scatter/qml/scatter/main.qml | 0 .../{graphs3d => graphs/3d}/scatter/scatter.pro | 0 .../{graphs3d => graphs/3d}/scatter/scatter.qrc | 0 .../3d}/surfacegallery/CMakeLists.txt | 0 .../3d}/surfacegallery/datasource.cpp | 0 .../3d}/surfacegallery/datasource.h | 0 .../doc/images/surfacegallery-example.png | Bin .../3d}/surfacegallery/doc/src/surfacegallery.qdoc | 2 +- .../{graphs3d => graphs/3d}/surfacegallery/main.cpp | 0 .../qml/surfacegallery/SpectrogramData.qml | 0 .../qml/surfacegallery/SurfaceHeightMap.qml | 0 .../qml/surfacegallery/SurfaceOscilloscope.qml | 0 .../qml/surfacegallery/SurfaceSpectrogram.qml | 0 .../surfacegallery/qml/surfacegallery/heightmap.png | Bin .../qml/surfacegallery/heightmap.readme | 0 .../3d}/surfacegallery/qml/surfacegallery/main.qml | 0 .../3d}/surfacegallery/surfacegallery.pro | 0 .../3d}/surfacegallery/surfacegallery.qrc | 0 .../3d}/widgetgraphgallery/CMakeLists.txt | 0 .../3d}/widgetgraphgallery/axesinputhandler.cpp | 0 .../3d}/widgetgraphgallery/axesinputhandler.h | 0 .../3d}/widgetgraphgallery/bargraph.cpp | 0 .../3d}/widgetgraphgallery/bargraph.h | 0 .../3d}/widgetgraphgallery/custominputhandler.cpp | 0 .../3d}/widgetgraphgallery/custominputhandler.h | 0 .../3d}/widgetgraphgallery/data/layer_1.png | Bin .../3d}/widgetgraphgallery/data/layer_2.png | Bin .../3d}/widgetgraphgallery/data/layer_3.png | Bin .../3d}/widgetgraphgallery/data/license.txt | 0 .../3d}/widgetgraphgallery/data/maptexture.jpg | Bin .../3d}/widgetgraphgallery/data/narrowarrow.mesh | Bin .../3d}/widgetgraphgallery/data/oilrig.mesh | Bin .../3d}/widgetgraphgallery/data/pipe.mesh | Bin .../3d}/widgetgraphgallery/data/raindata.txt | 0 .../3d}/widgetgraphgallery/data/refinery.mesh | Bin .../3d}/widgetgraphgallery/data/refinery.obj | 0 .../3d}/widgetgraphgallery/data/topography.png | Bin .../doc/images/widgetgraphgallery-example.png | Bin .../doc/src/widgetgraphgallery.qdoc | 2 +- .../3d}/widgetgraphgallery/graphmodifier.cpp | 0 .../3d}/widgetgraphgallery/graphmodifier.h | 0 .../3d}/widgetgraphgallery/highlightseries.cpp | 0 .../3d}/widgetgraphgallery/highlightseries.h | 0 .../3d}/widgetgraphgallery/main.cpp | 0 .../3d}/widgetgraphgallery/rainfalldata.cpp | 0 .../3d}/widgetgraphgallery/rainfalldata.h | 0 .../3d}/widgetgraphgallery/scatterdatamodifier.cpp | 0 .../3d}/widgetgraphgallery/scatterdatamodifier.h | 0 .../3d}/widgetgraphgallery/scattergraph.cpp | 0 .../3d}/widgetgraphgallery/scattergraph.h | 0 .../3d}/widgetgraphgallery/surfacegraph.cpp | 0 .../3d}/widgetgraphgallery/surfacegraph.h | 0 .../3d}/widgetgraphgallery/surfacegraphmodifier.cpp | 0 .../3d}/widgetgraphgallery/surfacegraphmodifier.h | 0 .../3d}/widgetgraphgallery/topographicseries.cpp | 0 .../3d}/widgetgraphgallery/topographicseries.h | 0 .../widgetgraphgallery/variantbardatamapping.cpp | 0 .../3d}/widgetgraphgallery/variantbardatamapping.h | 0 .../3d}/widgetgraphgallery/variantbardataproxy.cpp | 0 .../3d}/widgetgraphgallery/variantbardataproxy.h | 0 .../3d}/widgetgraphgallery/variantdataset.cpp | 0 .../3d}/widgetgraphgallery/variantdataset.h | 0 .../3d}/widgetgraphgallery/widgetgraphgallery.pro | 0 .../3d}/widgetgraphgallery/widgetgraphgallery.qrc | 0 .../3d}/widgetvolumetric/CMakeLists.txt | 0 .../doc/images/widgetvolumetric-example.png | Bin .../widgetvolumetric/doc/src/widgetvolumetric.qdoc | 2 +- .../3d}/widgetvolumetric/layer_ground.png | Bin .../3d}/widgetvolumetric/layer_magma.png | Bin .../3d}/widgetvolumetric/layer_water.png | Bin .../3d}/widgetvolumetric/main.cpp | 0 .../3d}/widgetvolumetric/volumetric.cpp | 0 .../3d}/widgetvolumetric/volumetric.h | 0 .../3d}/widgetvolumetric/widgetvolumetric.pro | 0 .../3d}/widgetvolumetric/widgetvolumetric.qrc | 0 src/graphs3d/doc/qtgraphs.qdocconf | 5 ++++- 146 files changed, 14 insertions(+), 11 deletions(-) rename examples/{graphs2d/graphs2d.pro => graphs/2d/2d.pro} (100%) rename examples/{graphs2d => graphs/2d}/CMakeLists.txt (100%) rename examples/{graphs2d => graphs/2d}/examples.pri (100%) rename examples/{graphs2d => graphs/2d}/testbed/CMakeLists.txt (100%) rename examples/{graphs2d => graphs/2d}/testbed/custombarseries.cpp (100%) rename examples/{graphs2d => graphs/2d}/testbed/custombarseries.h (100%) rename examples/{graphs2d => graphs/2d}/testbed/main.cpp (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/AxisGridSetup.qml (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/BarSelection.qml (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/BarThemes.qml (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/Callout.qml (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/CppBarSeries.qml (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/CustomCheckBox.qml (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/CustomLabel.qml (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/CustomSelectionBox.qml (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/CustomSlider.qml (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/LineProperties.qml (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/ScatterProperties.qml (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/SettingsView.qml (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/StartupView.qml (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/images/arrow_icon.png (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/images/happy_box.png (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/images/icon_settings.png (100%) rename examples/{graphs2d => graphs/2d}/testbed/qml/testbed/main.qml (100%) rename examples/{graphs2d => graphs/2d}/testbed/testbed.pro (100%) rename examples/{graphs2d => graphs/2d}/testbed/testbed.qrc (100%) rename examples/{graphs3d/graphs3d.pro => graphs/3d/3d.pro} (100%) rename examples/{graphs3d => graphs/3d}/CMakeLists.txt (100%) rename examples/{graphs3d => graphs/3d}/axishandling/CMakeLists.txt (100%) rename examples/{graphs3d => graphs/3d}/axishandling/axishandling.pro (100%) rename examples/{graphs3d => graphs/3d}/axishandling/axishandling.qrc (100%) rename examples/{graphs3d => graphs/3d}/axishandling/customformatter.cpp (100%) rename examples/{graphs3d => graphs/3d}/axishandling/customformatter.h (100%) rename examples/{graphs3d => graphs/3d}/axishandling/doc/images/axishandling-example.png (100%) rename examples/{graphs3d => graphs/3d}/axishandling/doc/src/axishandling.qdoc (99%) rename examples/{graphs3d => graphs/3d}/axishandling/main.cpp (100%) rename examples/{graphs3d => graphs/3d}/axishandling/qml/axishandling/AxisDragging.qml (100%) rename examples/{graphs3d => graphs/3d}/axishandling/qml/axishandling/AxisFormatting.qml (100%) rename examples/{graphs3d => graphs/3d}/axishandling/qml/axishandling/Data.qml (100%) rename examples/{graphs3d => graphs/3d}/axishandling/qml/axishandling/cube.mesh (100%) rename examples/{graphs3d => graphs/3d}/axishandling/qml/axishandling/cubetexture.png (100%) rename examples/{graphs3d => graphs/3d}/axishandling/qml/axishandling/main.qml (100%) rename examples/{graphs3d => graphs/3d}/axishandling/qmldir (100%) rename examples/{graphs3d => graphs/3d}/bars/CMakeLists.txt (100%) rename examples/{graphs3d => graphs/3d}/bars/bars.pro (100%) rename examples/{graphs3d => graphs/3d}/bars/bars.qrc (100%) rename examples/{graphs3d => graphs/3d}/bars/doc/images/bars-example.png (100%) rename examples/{graphs3d => graphs/3d}/bars/doc/src/bars.qdoc (99%) rename examples/{graphs3d => graphs/3d}/bars/main.cpp (100%) rename examples/{graphs3d => graphs/3d}/bars/qml/bars/Axes.qml (100%) rename examples/{graphs3d => graphs/3d}/bars/qml/bars/Data.qml (100%) rename examples/{graphs3d => graphs/3d}/bars/qml/bars/main.qml (100%) rename examples/{graphs3d => graphs/3d}/examples.pri (100%) rename examples/{graphs3d => graphs/3d}/scatter/CMakeLists.txt (100%) rename examples/{graphs3d => graphs/3d}/scatter/doc/images/scatter-example.png (100%) rename examples/{graphs3d => graphs/3d}/scatter/doc/src/scatter.qdoc (99%) rename examples/{graphs3d => graphs/3d}/scatter/images/background.svg (100%) rename examples/{graphs3d => graphs/3d}/scatter/images/background_hide.svg (100%) rename examples/{graphs3d => graphs/3d}/scatter/images/camera.svg (100%) rename examples/{graphs3d => graphs/3d}/scatter/images/camera2.svg (100%) rename examples/{graphs3d => graphs/3d}/scatter/images/flatten.svg (100%) rename examples/{graphs3d => graphs/3d}/scatter/images/shadow.svg (100%) rename examples/{graphs3d => graphs/3d}/scatter/images/shadow_hide.svg (100%) rename examples/{graphs3d => graphs/3d}/scatter/images/smooth_curve.svg (100%) rename examples/{graphs3d => graphs/3d}/scatter/images/theme.svg (100%) rename examples/{graphs3d => graphs/3d}/scatter/main.cpp (100%) rename examples/{graphs3d => graphs/3d}/scatter/qml/scatter/Data.qml (100%) rename examples/{graphs3d => graphs/3d}/scatter/qml/scatter/Graph.qml (100%) rename examples/{graphs3d => graphs/3d}/scatter/qml/scatter/main.qml (100%) rename examples/{graphs3d => graphs/3d}/scatter/scatter.pro (100%) rename examples/{graphs3d => graphs/3d}/scatter/scatter.qrc (100%) rename examples/{graphs3d => graphs/3d}/surfacegallery/CMakeLists.txt (100%) rename examples/{graphs3d => graphs/3d}/surfacegallery/datasource.cpp (100%) rename examples/{graphs3d => graphs/3d}/surfacegallery/datasource.h (100%) rename examples/{graphs3d => graphs/3d}/surfacegallery/doc/images/surfacegallery-example.png (100%) rename examples/{graphs3d => graphs/3d}/surfacegallery/doc/src/surfacegallery.qdoc (99%) rename examples/{graphs3d => graphs/3d}/surfacegallery/main.cpp (100%) rename examples/{graphs3d => graphs/3d}/surfacegallery/qml/surfacegallery/SpectrogramData.qml (100%) rename examples/{graphs3d => graphs/3d}/surfacegallery/qml/surfacegallery/SurfaceHeightMap.qml (100%) rename examples/{graphs3d => graphs/3d}/surfacegallery/qml/surfacegallery/SurfaceOscilloscope.qml (100%) rename examples/{graphs3d => graphs/3d}/surfacegallery/qml/surfacegallery/SurfaceSpectrogram.qml (100%) rename examples/{graphs3d => graphs/3d}/surfacegallery/qml/surfacegallery/heightmap.png (100%) rename examples/{graphs3d => graphs/3d}/surfacegallery/qml/surfacegallery/heightmap.readme (100%) rename examples/{graphs3d => graphs/3d}/surfacegallery/qml/surfacegallery/main.qml (100%) rename examples/{graphs3d => graphs/3d}/surfacegallery/surfacegallery.pro (100%) rename examples/{graphs3d => graphs/3d}/surfacegallery/surfacegallery.qrc (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/CMakeLists.txt (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/axesinputhandler.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/axesinputhandler.h (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/bargraph.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/bargraph.h (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/custominputhandler.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/custominputhandler.h (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/data/layer_1.png (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/data/layer_2.png (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/data/layer_3.png (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/data/license.txt (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/data/maptexture.jpg (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/data/narrowarrow.mesh (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/data/oilrig.mesh (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/data/pipe.mesh (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/data/raindata.txt (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/data/refinery.mesh (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/data/refinery.obj (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/data/topography.png (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/doc/images/widgetgraphgallery-example.png (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/doc/src/widgetgraphgallery.qdoc (99%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/graphmodifier.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/graphmodifier.h (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/highlightseries.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/highlightseries.h (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/main.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/rainfalldata.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/rainfalldata.h (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/scatterdatamodifier.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/scatterdatamodifier.h (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/scattergraph.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/scattergraph.h (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/surfacegraph.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/surfacegraph.h (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/surfacegraphmodifier.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/surfacegraphmodifier.h (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/topographicseries.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/topographicseries.h (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/variantbardatamapping.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/variantbardatamapping.h (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/variantbardataproxy.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/variantbardataproxy.h (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/variantdataset.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/variantdataset.h (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/widgetgraphgallery.pro (100%) rename examples/{graphs3d => graphs/3d}/widgetgraphgallery/widgetgraphgallery.qrc (100%) rename examples/{graphs3d => graphs/3d}/widgetvolumetric/CMakeLists.txt (100%) rename examples/{graphs3d => graphs/3d}/widgetvolumetric/doc/images/widgetvolumetric-example.png (100%) rename examples/{graphs3d => graphs/3d}/widgetvolumetric/doc/src/widgetvolumetric.qdoc (99%) rename examples/{graphs3d => graphs/3d}/widgetvolumetric/layer_ground.png (100%) rename examples/{graphs3d => graphs/3d}/widgetvolumetric/layer_magma.png (100%) rename examples/{graphs3d => graphs/3d}/widgetvolumetric/layer_water.png (100%) rename examples/{graphs3d => graphs/3d}/widgetvolumetric/main.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetvolumetric/volumetric.cpp (100%) rename examples/{graphs3d => graphs/3d}/widgetvolumetric/volumetric.h (100%) rename examples/{graphs3d => graphs/3d}/widgetvolumetric/widgetvolumetric.pro (100%) rename examples/{graphs3d => graphs/3d}/widgetvolumetric/widgetvolumetric.qrc (100%) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 966ffacc..15d0384c 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -3,7 +3,7 @@ qt_examples_build_begin(EXTERNAL_BUILD) -add_subdirectory(graphs3d) -add_subdirectory(graphs2d) +add_subdirectory(graphs/3d) +add_subdirectory(graphs/2d) qt_examples_build_end() diff --git a/examples/examples.pro b/examples/examples.pro index b331be6c..3080ab49 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += graphs3d -SUBDIRS += graphs2d +SUBDIRS += graphs/2d +SUBDIRS += graphs/3d diff --git a/examples/graphs2d/graphs2d.pro b/examples/graphs/2d/2d.pro similarity index 100% rename from examples/graphs2d/graphs2d.pro rename to examples/graphs/2d/2d.pro diff --git a/examples/graphs2d/CMakeLists.txt b/examples/graphs/2d/CMakeLists.txt similarity index 100% rename from examples/graphs2d/CMakeLists.txt rename to examples/graphs/2d/CMakeLists.txt diff --git a/examples/graphs2d/examples.pri b/examples/graphs/2d/examples.pri similarity index 100% rename from examples/graphs2d/examples.pri rename to examples/graphs/2d/examples.pri diff --git a/examples/graphs2d/testbed/CMakeLists.txt b/examples/graphs/2d/testbed/CMakeLists.txt similarity index 100% rename from examples/graphs2d/testbed/CMakeLists.txt rename to examples/graphs/2d/testbed/CMakeLists.txt diff --git a/examples/graphs2d/testbed/custombarseries.cpp b/examples/graphs/2d/testbed/custombarseries.cpp similarity index 100% rename from examples/graphs2d/testbed/custombarseries.cpp rename to examples/graphs/2d/testbed/custombarseries.cpp diff --git a/examples/graphs2d/testbed/custombarseries.h b/examples/graphs/2d/testbed/custombarseries.h similarity index 100% rename from examples/graphs2d/testbed/custombarseries.h rename to examples/graphs/2d/testbed/custombarseries.h diff --git a/examples/graphs2d/testbed/main.cpp b/examples/graphs/2d/testbed/main.cpp similarity index 100% rename from examples/graphs2d/testbed/main.cpp rename to examples/graphs/2d/testbed/main.cpp diff --git a/examples/graphs2d/testbed/qml/testbed/AxisGridSetup.qml b/examples/graphs/2d/testbed/qml/testbed/AxisGridSetup.qml similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/AxisGridSetup.qml rename to examples/graphs/2d/testbed/qml/testbed/AxisGridSetup.qml diff --git a/examples/graphs2d/testbed/qml/testbed/BarSelection.qml b/examples/graphs/2d/testbed/qml/testbed/BarSelection.qml similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/BarSelection.qml rename to examples/graphs/2d/testbed/qml/testbed/BarSelection.qml diff --git a/examples/graphs2d/testbed/qml/testbed/BarThemes.qml b/examples/graphs/2d/testbed/qml/testbed/BarThemes.qml similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/BarThemes.qml rename to examples/graphs/2d/testbed/qml/testbed/BarThemes.qml diff --git a/examples/graphs2d/testbed/qml/testbed/Callout.qml b/examples/graphs/2d/testbed/qml/testbed/Callout.qml similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/Callout.qml rename to examples/graphs/2d/testbed/qml/testbed/Callout.qml diff --git a/examples/graphs2d/testbed/qml/testbed/CppBarSeries.qml b/examples/graphs/2d/testbed/qml/testbed/CppBarSeries.qml similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/CppBarSeries.qml rename to examples/graphs/2d/testbed/qml/testbed/CppBarSeries.qml diff --git a/examples/graphs2d/testbed/qml/testbed/CustomCheckBox.qml b/examples/graphs/2d/testbed/qml/testbed/CustomCheckBox.qml similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/CustomCheckBox.qml rename to examples/graphs/2d/testbed/qml/testbed/CustomCheckBox.qml diff --git a/examples/graphs2d/testbed/qml/testbed/CustomLabel.qml b/examples/graphs/2d/testbed/qml/testbed/CustomLabel.qml similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/CustomLabel.qml rename to examples/graphs/2d/testbed/qml/testbed/CustomLabel.qml diff --git a/examples/graphs2d/testbed/qml/testbed/CustomSelectionBox.qml b/examples/graphs/2d/testbed/qml/testbed/CustomSelectionBox.qml similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/CustomSelectionBox.qml rename to examples/graphs/2d/testbed/qml/testbed/CustomSelectionBox.qml diff --git a/examples/graphs2d/testbed/qml/testbed/CustomSlider.qml b/examples/graphs/2d/testbed/qml/testbed/CustomSlider.qml similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/CustomSlider.qml rename to examples/graphs/2d/testbed/qml/testbed/CustomSlider.qml diff --git a/examples/graphs2d/testbed/qml/testbed/LineProperties.qml b/examples/graphs/2d/testbed/qml/testbed/LineProperties.qml similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/LineProperties.qml rename to examples/graphs/2d/testbed/qml/testbed/LineProperties.qml diff --git a/examples/graphs2d/testbed/qml/testbed/ScatterProperties.qml b/examples/graphs/2d/testbed/qml/testbed/ScatterProperties.qml similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/ScatterProperties.qml rename to examples/graphs/2d/testbed/qml/testbed/ScatterProperties.qml diff --git a/examples/graphs2d/testbed/qml/testbed/SettingsView.qml b/examples/graphs/2d/testbed/qml/testbed/SettingsView.qml similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/SettingsView.qml rename to examples/graphs/2d/testbed/qml/testbed/SettingsView.qml diff --git a/examples/graphs2d/testbed/qml/testbed/StartupView.qml b/examples/graphs/2d/testbed/qml/testbed/StartupView.qml similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/StartupView.qml rename to examples/graphs/2d/testbed/qml/testbed/StartupView.qml diff --git a/examples/graphs2d/testbed/qml/testbed/images/arrow_icon.png b/examples/graphs/2d/testbed/qml/testbed/images/arrow_icon.png similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/images/arrow_icon.png rename to examples/graphs/2d/testbed/qml/testbed/images/arrow_icon.png diff --git a/examples/graphs2d/testbed/qml/testbed/images/happy_box.png b/examples/graphs/2d/testbed/qml/testbed/images/happy_box.png similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/images/happy_box.png rename to examples/graphs/2d/testbed/qml/testbed/images/happy_box.png diff --git a/examples/graphs2d/testbed/qml/testbed/images/icon_settings.png b/examples/graphs/2d/testbed/qml/testbed/images/icon_settings.png similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/images/icon_settings.png rename to examples/graphs/2d/testbed/qml/testbed/images/icon_settings.png diff --git a/examples/graphs2d/testbed/qml/testbed/main.qml b/examples/graphs/2d/testbed/qml/testbed/main.qml similarity index 100% rename from examples/graphs2d/testbed/qml/testbed/main.qml rename to examples/graphs/2d/testbed/qml/testbed/main.qml diff --git a/examples/graphs2d/testbed/testbed.pro b/examples/graphs/2d/testbed/testbed.pro similarity index 100% rename from examples/graphs2d/testbed/testbed.pro rename to examples/graphs/2d/testbed/testbed.pro diff --git a/examples/graphs2d/testbed/testbed.qrc b/examples/graphs/2d/testbed/testbed.qrc similarity index 100% rename from examples/graphs2d/testbed/testbed.qrc rename to examples/graphs/2d/testbed/testbed.qrc diff --git a/examples/graphs3d/graphs3d.pro b/examples/graphs/3d/3d.pro similarity index 100% rename from examples/graphs3d/graphs3d.pro rename to examples/graphs/3d/3d.pro diff --git a/examples/graphs3d/CMakeLists.txt b/examples/graphs/3d/CMakeLists.txt similarity index 100% rename from examples/graphs3d/CMakeLists.txt rename to examples/graphs/3d/CMakeLists.txt diff --git a/examples/graphs3d/axishandling/CMakeLists.txt b/examples/graphs/3d/axishandling/CMakeLists.txt similarity index 100% rename from examples/graphs3d/axishandling/CMakeLists.txt rename to examples/graphs/3d/axishandling/CMakeLists.txt diff --git a/examples/graphs3d/axishandling/axishandling.pro b/examples/graphs/3d/axishandling/axishandling.pro similarity index 100% rename from examples/graphs3d/axishandling/axishandling.pro rename to examples/graphs/3d/axishandling/axishandling.pro diff --git a/examples/graphs3d/axishandling/axishandling.qrc b/examples/graphs/3d/axishandling/axishandling.qrc similarity index 100% rename from examples/graphs3d/axishandling/axishandling.qrc rename to examples/graphs/3d/axishandling/axishandling.qrc diff --git a/examples/graphs3d/axishandling/customformatter.cpp b/examples/graphs/3d/axishandling/customformatter.cpp similarity index 100% rename from examples/graphs3d/axishandling/customformatter.cpp rename to examples/graphs/3d/axishandling/customformatter.cpp diff --git a/examples/graphs3d/axishandling/customformatter.h b/examples/graphs/3d/axishandling/customformatter.h similarity index 100% rename from examples/graphs3d/axishandling/customformatter.h rename to examples/graphs/3d/axishandling/customformatter.h diff --git a/examples/graphs3d/axishandling/doc/images/axishandling-example.png b/examples/graphs/3d/axishandling/doc/images/axishandling-example.png similarity index 100% rename from examples/graphs3d/axishandling/doc/images/axishandling-example.png rename to examples/graphs/3d/axishandling/doc/images/axishandling-example.png diff --git a/examples/graphs3d/axishandling/doc/src/axishandling.qdoc b/examples/graphs/3d/axishandling/doc/src/axishandling.qdoc similarity index 99% rename from examples/graphs3d/axishandling/doc/src/axishandling.qdoc rename to examples/graphs/3d/axishandling/doc/src/axishandling.qdoc index 079e9ce6..44eff198 100644 --- a/examples/graphs3d/axishandling/doc/src/axishandling.qdoc +++ b/examples/graphs/3d/axishandling/doc/src/axishandling.qdoc @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! - \example axishandling + \example 3d/axishandling \meta tags {Graphs, Scatter3D, Custom Input Handler, Dynamic Data, Custom Axis Formatter, Scatter Graph} \examplecategory {Data Visualization & 3D} \title Axis Handling diff --git a/examples/graphs3d/axishandling/main.cpp b/examples/graphs/3d/axishandling/main.cpp similarity index 100% rename from examples/graphs3d/axishandling/main.cpp rename to examples/graphs/3d/axishandling/main.cpp diff --git a/examples/graphs3d/axishandling/qml/axishandling/AxisDragging.qml b/examples/graphs/3d/axishandling/qml/axishandling/AxisDragging.qml similarity index 100% rename from examples/graphs3d/axishandling/qml/axishandling/AxisDragging.qml rename to examples/graphs/3d/axishandling/qml/axishandling/AxisDragging.qml diff --git a/examples/graphs3d/axishandling/qml/axishandling/AxisFormatting.qml b/examples/graphs/3d/axishandling/qml/axishandling/AxisFormatting.qml similarity index 100% rename from examples/graphs3d/axishandling/qml/axishandling/AxisFormatting.qml rename to examples/graphs/3d/axishandling/qml/axishandling/AxisFormatting.qml diff --git a/examples/graphs3d/axishandling/qml/axishandling/Data.qml b/examples/graphs/3d/axishandling/qml/axishandling/Data.qml similarity index 100% rename from examples/graphs3d/axishandling/qml/axishandling/Data.qml rename to examples/graphs/3d/axishandling/qml/axishandling/Data.qml diff --git a/examples/graphs3d/axishandling/qml/axishandling/cube.mesh b/examples/graphs/3d/axishandling/qml/axishandling/cube.mesh similarity index 100% rename from examples/graphs3d/axishandling/qml/axishandling/cube.mesh rename to examples/graphs/3d/axishandling/qml/axishandling/cube.mesh diff --git a/examples/graphs3d/axishandling/qml/axishandling/cubetexture.png b/examples/graphs/3d/axishandling/qml/axishandling/cubetexture.png similarity index 100% rename from examples/graphs3d/axishandling/qml/axishandling/cubetexture.png rename to examples/graphs/3d/axishandling/qml/axishandling/cubetexture.png diff --git a/examples/graphs3d/axishandling/qml/axishandling/main.qml b/examples/graphs/3d/axishandling/qml/axishandling/main.qml similarity index 100% rename from examples/graphs3d/axishandling/qml/axishandling/main.qml rename to examples/graphs/3d/axishandling/qml/axishandling/main.qml diff --git a/examples/graphs3d/axishandling/qmldir b/examples/graphs/3d/axishandling/qmldir similarity index 100% rename from examples/graphs3d/axishandling/qmldir rename to examples/graphs/3d/axishandling/qmldir diff --git a/examples/graphs3d/bars/CMakeLists.txt b/examples/graphs/3d/bars/CMakeLists.txt similarity index 100% rename from examples/graphs3d/bars/CMakeLists.txt rename to examples/graphs/3d/bars/CMakeLists.txt diff --git a/examples/graphs3d/bars/bars.pro b/examples/graphs/3d/bars/bars.pro similarity index 100% rename from examples/graphs3d/bars/bars.pro rename to examples/graphs/3d/bars/bars.pro diff --git a/examples/graphs3d/bars/bars.qrc b/examples/graphs/3d/bars/bars.qrc similarity index 100% rename from examples/graphs3d/bars/bars.qrc rename to examples/graphs/3d/bars/bars.qrc diff --git a/examples/graphs3d/bars/doc/images/bars-example.png b/examples/graphs/3d/bars/doc/images/bars-example.png similarity index 100% rename from examples/graphs3d/bars/doc/images/bars-example.png rename to examples/graphs/3d/bars/doc/images/bars-example.png diff --git a/examples/graphs3d/bars/doc/src/bars.qdoc b/examples/graphs/3d/bars/doc/src/bars.qdoc similarity index 99% rename from examples/graphs3d/bars/doc/src/bars.qdoc rename to examples/graphs/3d/bars/doc/src/bars.qdoc index f45e3fc9..b16097f6 100644 --- a/examples/graphs3d/bars/doc/src/bars.qdoc +++ b/examples/graphs/3d/bars/doc/src/bars.qdoc @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! - \example bars + \example 3d/bars \meta tags {Graphs, Barsr3D, Multiple Series} \examplecategory {Data Visualization & 3D} \title Simple Bar Graph diff --git a/examples/graphs3d/bars/main.cpp b/examples/graphs/3d/bars/main.cpp similarity index 100% rename from examples/graphs3d/bars/main.cpp rename to examples/graphs/3d/bars/main.cpp diff --git a/examples/graphs3d/bars/qml/bars/Axes.qml b/examples/graphs/3d/bars/qml/bars/Axes.qml similarity index 100% rename from examples/graphs3d/bars/qml/bars/Axes.qml rename to examples/graphs/3d/bars/qml/bars/Axes.qml diff --git a/examples/graphs3d/bars/qml/bars/Data.qml b/examples/graphs/3d/bars/qml/bars/Data.qml similarity index 100% rename from examples/graphs3d/bars/qml/bars/Data.qml rename to examples/graphs/3d/bars/qml/bars/Data.qml diff --git a/examples/graphs3d/bars/qml/bars/main.qml b/examples/graphs/3d/bars/qml/bars/main.qml similarity index 100% rename from examples/graphs3d/bars/qml/bars/main.qml rename to examples/graphs/3d/bars/qml/bars/main.qml diff --git a/examples/graphs3d/examples.pri b/examples/graphs/3d/examples.pri similarity index 100% rename from examples/graphs3d/examples.pri rename to examples/graphs/3d/examples.pri diff --git a/examples/graphs3d/scatter/CMakeLists.txt b/examples/graphs/3d/scatter/CMakeLists.txt similarity index 100% rename from examples/graphs3d/scatter/CMakeLists.txt rename to examples/graphs/3d/scatter/CMakeLists.txt diff --git a/examples/graphs3d/scatter/doc/images/scatter-example.png b/examples/graphs/3d/scatter/doc/images/scatter-example.png similarity index 100% rename from examples/graphs3d/scatter/doc/images/scatter-example.png rename to examples/graphs/3d/scatter/doc/images/scatter-example.png diff --git a/examples/graphs3d/scatter/doc/src/scatter.qdoc b/examples/graphs/3d/scatter/doc/src/scatter.qdoc similarity index 99% rename from examples/graphs3d/scatter/doc/src/scatter.qdoc rename to examples/graphs/3d/scatter/doc/src/scatter.qdoc index d9f57c84..d9de9539 100644 --- a/examples/graphs3d/scatter/doc/src/scatter.qdoc +++ b/examples/graphs/3d/scatter/doc/src/scatter.qdoc @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! - \example scatter + \example 3d/scatter \meta tags {Graphs, Scatter3D, Multiple Series} \examplecategory {Data Visualization & 3D} \title Simple Scatter Graph diff --git a/examples/graphs3d/scatter/images/background.svg b/examples/graphs/3d/scatter/images/background.svg similarity index 100% rename from examples/graphs3d/scatter/images/background.svg rename to examples/graphs/3d/scatter/images/background.svg diff --git a/examples/graphs3d/scatter/images/background_hide.svg b/examples/graphs/3d/scatter/images/background_hide.svg similarity index 100% rename from examples/graphs3d/scatter/images/background_hide.svg rename to examples/graphs/3d/scatter/images/background_hide.svg diff --git a/examples/graphs3d/scatter/images/camera.svg b/examples/graphs/3d/scatter/images/camera.svg similarity index 100% rename from examples/graphs3d/scatter/images/camera.svg rename to examples/graphs/3d/scatter/images/camera.svg diff --git a/examples/graphs3d/scatter/images/camera2.svg b/examples/graphs/3d/scatter/images/camera2.svg similarity index 100% rename from examples/graphs3d/scatter/images/camera2.svg rename to examples/graphs/3d/scatter/images/camera2.svg diff --git a/examples/graphs3d/scatter/images/flatten.svg b/examples/graphs/3d/scatter/images/flatten.svg similarity index 100% rename from examples/graphs3d/scatter/images/flatten.svg rename to examples/graphs/3d/scatter/images/flatten.svg diff --git a/examples/graphs3d/scatter/images/shadow.svg b/examples/graphs/3d/scatter/images/shadow.svg similarity index 100% rename from examples/graphs3d/scatter/images/shadow.svg rename to examples/graphs/3d/scatter/images/shadow.svg diff --git a/examples/graphs3d/scatter/images/shadow_hide.svg b/examples/graphs/3d/scatter/images/shadow_hide.svg similarity index 100% rename from examples/graphs3d/scatter/images/shadow_hide.svg rename to examples/graphs/3d/scatter/images/shadow_hide.svg diff --git a/examples/graphs3d/scatter/images/smooth_curve.svg b/examples/graphs/3d/scatter/images/smooth_curve.svg similarity index 100% rename from examples/graphs3d/scatter/images/smooth_curve.svg rename to examples/graphs/3d/scatter/images/smooth_curve.svg diff --git a/examples/graphs3d/scatter/images/theme.svg b/examples/graphs/3d/scatter/images/theme.svg similarity index 100% rename from examples/graphs3d/scatter/images/theme.svg rename to examples/graphs/3d/scatter/images/theme.svg diff --git a/examples/graphs3d/scatter/main.cpp b/examples/graphs/3d/scatter/main.cpp similarity index 100% rename from examples/graphs3d/scatter/main.cpp rename to examples/graphs/3d/scatter/main.cpp diff --git a/examples/graphs3d/scatter/qml/scatter/Data.qml b/examples/graphs/3d/scatter/qml/scatter/Data.qml similarity index 100% rename from examples/graphs3d/scatter/qml/scatter/Data.qml rename to examples/graphs/3d/scatter/qml/scatter/Data.qml diff --git a/examples/graphs3d/scatter/qml/scatter/Graph.qml b/examples/graphs/3d/scatter/qml/scatter/Graph.qml similarity index 100% rename from examples/graphs3d/scatter/qml/scatter/Graph.qml rename to examples/graphs/3d/scatter/qml/scatter/Graph.qml diff --git a/examples/graphs3d/scatter/qml/scatter/main.qml b/examples/graphs/3d/scatter/qml/scatter/main.qml similarity index 100% rename from examples/graphs3d/scatter/qml/scatter/main.qml rename to examples/graphs/3d/scatter/qml/scatter/main.qml diff --git a/examples/graphs3d/scatter/scatter.pro b/examples/graphs/3d/scatter/scatter.pro similarity index 100% rename from examples/graphs3d/scatter/scatter.pro rename to examples/graphs/3d/scatter/scatter.pro diff --git a/examples/graphs3d/scatter/scatter.qrc b/examples/graphs/3d/scatter/scatter.qrc similarity index 100% rename from examples/graphs3d/scatter/scatter.qrc rename to examples/graphs/3d/scatter/scatter.qrc diff --git a/examples/graphs3d/surfacegallery/CMakeLists.txt b/examples/graphs/3d/surfacegallery/CMakeLists.txt similarity index 100% rename from examples/graphs3d/surfacegallery/CMakeLists.txt rename to examples/graphs/3d/surfacegallery/CMakeLists.txt diff --git a/examples/graphs3d/surfacegallery/datasource.cpp b/examples/graphs/3d/surfacegallery/datasource.cpp similarity index 100% rename from examples/graphs3d/surfacegallery/datasource.cpp rename to examples/graphs/3d/surfacegallery/datasource.cpp diff --git a/examples/graphs3d/surfacegallery/datasource.h b/examples/graphs/3d/surfacegallery/datasource.h similarity index 100% rename from examples/graphs3d/surfacegallery/datasource.h rename to examples/graphs/3d/surfacegallery/datasource.h diff --git a/examples/graphs3d/surfacegallery/doc/images/surfacegallery-example.png b/examples/graphs/3d/surfacegallery/doc/images/surfacegallery-example.png similarity index 100% rename from examples/graphs3d/surfacegallery/doc/images/surfacegallery-example.png rename to examples/graphs/3d/surfacegallery/doc/images/surfacegallery-example.png diff --git a/examples/graphs3d/surfacegallery/doc/src/surfacegallery.qdoc b/examples/graphs/3d/surfacegallery/doc/src/surfacegallery.qdoc similarity index 99% rename from examples/graphs3d/surfacegallery/doc/src/surfacegallery.qdoc rename to examples/graphs/3d/surfacegallery/doc/src/surfacegallery.qdoc index 32000c4a..a34dff43 100644 --- a/examples/graphs3d/surfacegallery/doc/src/surfacegallery.qdoc +++ b/examples/graphs/3d/surfacegallery/doc/src/surfacegallery.qdoc @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! - \example surfacegallery + \example 3d/surfacegallery \meta tags {Graphs, Surface3D, Dynamic Data, Surface Graph, Height Map, Polar Graph} \examplecategory {Data Visualization & 3D} \title Surface Graph Gallery diff --git a/examples/graphs3d/surfacegallery/main.cpp b/examples/graphs/3d/surfacegallery/main.cpp similarity index 100% rename from examples/graphs3d/surfacegallery/main.cpp rename to examples/graphs/3d/surfacegallery/main.cpp diff --git a/examples/graphs3d/surfacegallery/qml/surfacegallery/SpectrogramData.qml b/examples/graphs/3d/surfacegallery/qml/surfacegallery/SpectrogramData.qml similarity index 100% rename from examples/graphs3d/surfacegallery/qml/surfacegallery/SpectrogramData.qml rename to examples/graphs/3d/surfacegallery/qml/surfacegallery/SpectrogramData.qml diff --git a/examples/graphs3d/surfacegallery/qml/surfacegallery/SurfaceHeightMap.qml b/examples/graphs/3d/surfacegallery/qml/surfacegallery/SurfaceHeightMap.qml similarity index 100% rename from examples/graphs3d/surfacegallery/qml/surfacegallery/SurfaceHeightMap.qml rename to examples/graphs/3d/surfacegallery/qml/surfacegallery/SurfaceHeightMap.qml diff --git a/examples/graphs3d/surfacegallery/qml/surfacegallery/SurfaceOscilloscope.qml b/examples/graphs/3d/surfacegallery/qml/surfacegallery/SurfaceOscilloscope.qml similarity index 100% rename from examples/graphs3d/surfacegallery/qml/surfacegallery/SurfaceOscilloscope.qml rename to examples/graphs/3d/surfacegallery/qml/surfacegallery/SurfaceOscilloscope.qml diff --git a/examples/graphs3d/surfacegallery/qml/surfacegallery/SurfaceSpectrogram.qml b/examples/graphs/3d/surfacegallery/qml/surfacegallery/SurfaceSpectrogram.qml similarity index 100% rename from examples/graphs3d/surfacegallery/qml/surfacegallery/SurfaceSpectrogram.qml rename to examples/graphs/3d/surfacegallery/qml/surfacegallery/SurfaceSpectrogram.qml diff --git a/examples/graphs3d/surfacegallery/qml/surfacegallery/heightmap.png b/examples/graphs/3d/surfacegallery/qml/surfacegallery/heightmap.png similarity index 100% rename from examples/graphs3d/surfacegallery/qml/surfacegallery/heightmap.png rename to examples/graphs/3d/surfacegallery/qml/surfacegallery/heightmap.png diff --git a/examples/graphs3d/surfacegallery/qml/surfacegallery/heightmap.readme b/examples/graphs/3d/surfacegallery/qml/surfacegallery/heightmap.readme similarity index 100% rename from examples/graphs3d/surfacegallery/qml/surfacegallery/heightmap.readme rename to examples/graphs/3d/surfacegallery/qml/surfacegallery/heightmap.readme diff --git a/examples/graphs3d/surfacegallery/qml/surfacegallery/main.qml b/examples/graphs/3d/surfacegallery/qml/surfacegallery/main.qml similarity index 100% rename from examples/graphs3d/surfacegallery/qml/surfacegallery/main.qml rename to examples/graphs/3d/surfacegallery/qml/surfacegallery/main.qml diff --git a/examples/graphs3d/surfacegallery/surfacegallery.pro b/examples/graphs/3d/surfacegallery/surfacegallery.pro similarity index 100% rename from examples/graphs3d/surfacegallery/surfacegallery.pro rename to examples/graphs/3d/surfacegallery/surfacegallery.pro diff --git a/examples/graphs3d/surfacegallery/surfacegallery.qrc b/examples/graphs/3d/surfacegallery/surfacegallery.qrc similarity index 100% rename from examples/graphs3d/surfacegallery/surfacegallery.qrc rename to examples/graphs/3d/surfacegallery/surfacegallery.qrc diff --git a/examples/graphs3d/widgetgraphgallery/CMakeLists.txt b/examples/graphs/3d/widgetgraphgallery/CMakeLists.txt similarity index 100% rename from examples/graphs3d/widgetgraphgallery/CMakeLists.txt rename to examples/graphs/3d/widgetgraphgallery/CMakeLists.txt diff --git a/examples/graphs3d/widgetgraphgallery/axesinputhandler.cpp b/examples/graphs/3d/widgetgraphgallery/axesinputhandler.cpp similarity index 100% rename from examples/graphs3d/widgetgraphgallery/axesinputhandler.cpp rename to examples/graphs/3d/widgetgraphgallery/axesinputhandler.cpp diff --git a/examples/graphs3d/widgetgraphgallery/axesinputhandler.h b/examples/graphs/3d/widgetgraphgallery/axesinputhandler.h similarity index 100% rename from examples/graphs3d/widgetgraphgallery/axesinputhandler.h rename to examples/graphs/3d/widgetgraphgallery/axesinputhandler.h diff --git a/examples/graphs3d/widgetgraphgallery/bargraph.cpp b/examples/graphs/3d/widgetgraphgallery/bargraph.cpp similarity index 100% rename from examples/graphs3d/widgetgraphgallery/bargraph.cpp rename to examples/graphs/3d/widgetgraphgallery/bargraph.cpp diff --git a/examples/graphs3d/widgetgraphgallery/bargraph.h b/examples/graphs/3d/widgetgraphgallery/bargraph.h similarity index 100% rename from examples/graphs3d/widgetgraphgallery/bargraph.h rename to examples/graphs/3d/widgetgraphgallery/bargraph.h diff --git a/examples/graphs3d/widgetgraphgallery/custominputhandler.cpp b/examples/graphs/3d/widgetgraphgallery/custominputhandler.cpp similarity index 100% rename from examples/graphs3d/widgetgraphgallery/custominputhandler.cpp rename to examples/graphs/3d/widgetgraphgallery/custominputhandler.cpp diff --git a/examples/graphs3d/widgetgraphgallery/custominputhandler.h b/examples/graphs/3d/widgetgraphgallery/custominputhandler.h similarity index 100% rename from examples/graphs3d/widgetgraphgallery/custominputhandler.h rename to examples/graphs/3d/widgetgraphgallery/custominputhandler.h diff --git a/examples/graphs3d/widgetgraphgallery/data/layer_1.png b/examples/graphs/3d/widgetgraphgallery/data/layer_1.png similarity index 100% rename from examples/graphs3d/widgetgraphgallery/data/layer_1.png rename to examples/graphs/3d/widgetgraphgallery/data/layer_1.png diff --git a/examples/graphs3d/widgetgraphgallery/data/layer_2.png b/examples/graphs/3d/widgetgraphgallery/data/layer_2.png similarity index 100% rename from examples/graphs3d/widgetgraphgallery/data/layer_2.png rename to examples/graphs/3d/widgetgraphgallery/data/layer_2.png diff --git a/examples/graphs3d/widgetgraphgallery/data/layer_3.png b/examples/graphs/3d/widgetgraphgallery/data/layer_3.png similarity index 100% rename from examples/graphs3d/widgetgraphgallery/data/layer_3.png rename to examples/graphs/3d/widgetgraphgallery/data/layer_3.png diff --git a/examples/graphs3d/widgetgraphgallery/data/license.txt b/examples/graphs/3d/widgetgraphgallery/data/license.txt similarity index 100% rename from examples/graphs3d/widgetgraphgallery/data/license.txt rename to examples/graphs/3d/widgetgraphgallery/data/license.txt diff --git a/examples/graphs3d/widgetgraphgallery/data/maptexture.jpg b/examples/graphs/3d/widgetgraphgallery/data/maptexture.jpg similarity index 100% rename from examples/graphs3d/widgetgraphgallery/data/maptexture.jpg rename to examples/graphs/3d/widgetgraphgallery/data/maptexture.jpg diff --git a/examples/graphs3d/widgetgraphgallery/data/narrowarrow.mesh b/examples/graphs/3d/widgetgraphgallery/data/narrowarrow.mesh similarity index 100% rename from examples/graphs3d/widgetgraphgallery/data/narrowarrow.mesh rename to examples/graphs/3d/widgetgraphgallery/data/narrowarrow.mesh diff --git a/examples/graphs3d/widgetgraphgallery/data/oilrig.mesh b/examples/graphs/3d/widgetgraphgallery/data/oilrig.mesh similarity index 100% rename from examples/graphs3d/widgetgraphgallery/data/oilrig.mesh rename to examples/graphs/3d/widgetgraphgallery/data/oilrig.mesh diff --git a/examples/graphs3d/widgetgraphgallery/data/pipe.mesh b/examples/graphs/3d/widgetgraphgallery/data/pipe.mesh similarity index 100% rename from examples/graphs3d/widgetgraphgallery/data/pipe.mesh rename to examples/graphs/3d/widgetgraphgallery/data/pipe.mesh diff --git a/examples/graphs3d/widgetgraphgallery/data/raindata.txt b/examples/graphs/3d/widgetgraphgallery/data/raindata.txt similarity index 100% rename from examples/graphs3d/widgetgraphgallery/data/raindata.txt rename to examples/graphs/3d/widgetgraphgallery/data/raindata.txt diff --git a/examples/graphs3d/widgetgraphgallery/data/refinery.mesh b/examples/graphs/3d/widgetgraphgallery/data/refinery.mesh similarity index 100% rename from examples/graphs3d/widgetgraphgallery/data/refinery.mesh rename to examples/graphs/3d/widgetgraphgallery/data/refinery.mesh diff --git a/examples/graphs3d/widgetgraphgallery/data/refinery.obj b/examples/graphs/3d/widgetgraphgallery/data/refinery.obj similarity index 100% rename from examples/graphs3d/widgetgraphgallery/data/refinery.obj rename to examples/graphs/3d/widgetgraphgallery/data/refinery.obj diff --git a/examples/graphs3d/widgetgraphgallery/data/topography.png b/examples/graphs/3d/widgetgraphgallery/data/topography.png similarity index 100% rename from examples/graphs3d/widgetgraphgallery/data/topography.png rename to examples/graphs/3d/widgetgraphgallery/data/topography.png diff --git a/examples/graphs3d/widgetgraphgallery/doc/images/widgetgraphgallery-example.png b/examples/graphs/3d/widgetgraphgallery/doc/images/widgetgraphgallery-example.png similarity index 100% rename from examples/graphs3d/widgetgraphgallery/doc/images/widgetgraphgallery-example.png rename to examples/graphs/3d/widgetgraphgallery/doc/images/widgetgraphgallery-example.png diff --git a/examples/graphs3d/widgetgraphgallery/doc/src/widgetgraphgallery.qdoc b/examples/graphs/3d/widgetgraphgallery/doc/src/widgetgraphgallery.qdoc similarity index 99% rename from examples/graphs3d/widgetgraphgallery/doc/src/widgetgraphgallery.qdoc rename to examples/graphs/3d/widgetgraphgallery/doc/src/widgetgraphgallery.qdoc index 316556f4..da9512b0 100644 --- a/examples/graphs3d/widgetgraphgallery/doc/src/widgetgraphgallery.qdoc +++ b/examples/graphs/3d/widgetgraphgallery/doc/src/widgetgraphgallery.qdoc @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! - \example widgetgraphgallery + \example 3d/widgetgraphgallery \meta tags {Graphs, Q3DBars, Bar Graph, Custom Proxy, Q3DScatter, Scatter Graph, Custom Input Handler, Q3DSurface, Surface Graph, QCustom3DItem, Textured Surface} \examplecategory {Data Visualization & 3D} \title Graph Gallery diff --git a/examples/graphs3d/widgetgraphgallery/graphmodifier.cpp b/examples/graphs/3d/widgetgraphgallery/graphmodifier.cpp similarity index 100% rename from examples/graphs3d/widgetgraphgallery/graphmodifier.cpp rename to examples/graphs/3d/widgetgraphgallery/graphmodifier.cpp diff --git a/examples/graphs3d/widgetgraphgallery/graphmodifier.h b/examples/graphs/3d/widgetgraphgallery/graphmodifier.h similarity index 100% rename from examples/graphs3d/widgetgraphgallery/graphmodifier.h rename to examples/graphs/3d/widgetgraphgallery/graphmodifier.h diff --git a/examples/graphs3d/widgetgraphgallery/highlightseries.cpp b/examples/graphs/3d/widgetgraphgallery/highlightseries.cpp similarity index 100% rename from examples/graphs3d/widgetgraphgallery/highlightseries.cpp rename to examples/graphs/3d/widgetgraphgallery/highlightseries.cpp diff --git a/examples/graphs3d/widgetgraphgallery/highlightseries.h b/examples/graphs/3d/widgetgraphgallery/highlightseries.h similarity index 100% rename from examples/graphs3d/widgetgraphgallery/highlightseries.h rename to examples/graphs/3d/widgetgraphgallery/highlightseries.h diff --git a/examples/graphs3d/widgetgraphgallery/main.cpp b/examples/graphs/3d/widgetgraphgallery/main.cpp similarity index 100% rename from examples/graphs3d/widgetgraphgallery/main.cpp rename to examples/graphs/3d/widgetgraphgallery/main.cpp diff --git a/examples/graphs3d/widgetgraphgallery/rainfalldata.cpp b/examples/graphs/3d/widgetgraphgallery/rainfalldata.cpp similarity index 100% rename from examples/graphs3d/widgetgraphgallery/rainfalldata.cpp rename to examples/graphs/3d/widgetgraphgallery/rainfalldata.cpp diff --git a/examples/graphs3d/widgetgraphgallery/rainfalldata.h b/examples/graphs/3d/widgetgraphgallery/rainfalldata.h similarity index 100% rename from examples/graphs3d/widgetgraphgallery/rainfalldata.h rename to examples/graphs/3d/widgetgraphgallery/rainfalldata.h diff --git a/examples/graphs3d/widgetgraphgallery/scatterdatamodifier.cpp b/examples/graphs/3d/widgetgraphgallery/scatterdatamodifier.cpp similarity index 100% rename from examples/graphs3d/widgetgraphgallery/scatterdatamodifier.cpp rename to examples/graphs/3d/widgetgraphgallery/scatterdatamodifier.cpp diff --git a/examples/graphs3d/widgetgraphgallery/scatterdatamodifier.h b/examples/graphs/3d/widgetgraphgallery/scatterdatamodifier.h similarity index 100% rename from examples/graphs3d/widgetgraphgallery/scatterdatamodifier.h rename to examples/graphs/3d/widgetgraphgallery/scatterdatamodifier.h diff --git a/examples/graphs3d/widgetgraphgallery/scattergraph.cpp b/examples/graphs/3d/widgetgraphgallery/scattergraph.cpp similarity index 100% rename from examples/graphs3d/widgetgraphgallery/scattergraph.cpp rename to examples/graphs/3d/widgetgraphgallery/scattergraph.cpp diff --git a/examples/graphs3d/widgetgraphgallery/scattergraph.h b/examples/graphs/3d/widgetgraphgallery/scattergraph.h similarity index 100% rename from examples/graphs3d/widgetgraphgallery/scattergraph.h rename to examples/graphs/3d/widgetgraphgallery/scattergraph.h diff --git a/examples/graphs3d/widgetgraphgallery/surfacegraph.cpp b/examples/graphs/3d/widgetgraphgallery/surfacegraph.cpp similarity index 100% rename from examples/graphs3d/widgetgraphgallery/surfacegraph.cpp rename to examples/graphs/3d/widgetgraphgallery/surfacegraph.cpp diff --git a/examples/graphs3d/widgetgraphgallery/surfacegraph.h b/examples/graphs/3d/widgetgraphgallery/surfacegraph.h similarity index 100% rename from examples/graphs3d/widgetgraphgallery/surfacegraph.h rename to examples/graphs/3d/widgetgraphgallery/surfacegraph.h diff --git a/examples/graphs3d/widgetgraphgallery/surfacegraphmodifier.cpp b/examples/graphs/3d/widgetgraphgallery/surfacegraphmodifier.cpp similarity index 100% rename from examples/graphs3d/widgetgraphgallery/surfacegraphmodifier.cpp rename to examples/graphs/3d/widgetgraphgallery/surfacegraphmodifier.cpp diff --git a/examples/graphs3d/widgetgraphgallery/surfacegraphmodifier.h b/examples/graphs/3d/widgetgraphgallery/surfacegraphmodifier.h similarity index 100% rename from examples/graphs3d/widgetgraphgallery/surfacegraphmodifier.h rename to examples/graphs/3d/widgetgraphgallery/surfacegraphmodifier.h diff --git a/examples/graphs3d/widgetgraphgallery/topographicseries.cpp b/examples/graphs/3d/widgetgraphgallery/topographicseries.cpp similarity index 100% rename from examples/graphs3d/widgetgraphgallery/topographicseries.cpp rename to examples/graphs/3d/widgetgraphgallery/topographicseries.cpp diff --git a/examples/graphs3d/widgetgraphgallery/topographicseries.h b/examples/graphs/3d/widgetgraphgallery/topographicseries.h similarity index 100% rename from examples/graphs3d/widgetgraphgallery/topographicseries.h rename to examples/graphs/3d/widgetgraphgallery/topographicseries.h diff --git a/examples/graphs3d/widgetgraphgallery/variantbardatamapping.cpp b/examples/graphs/3d/widgetgraphgallery/variantbardatamapping.cpp similarity index 100% rename from examples/graphs3d/widgetgraphgallery/variantbardatamapping.cpp rename to examples/graphs/3d/widgetgraphgallery/variantbardatamapping.cpp diff --git a/examples/graphs3d/widgetgraphgallery/variantbardatamapping.h b/examples/graphs/3d/widgetgraphgallery/variantbardatamapping.h similarity index 100% rename from examples/graphs3d/widgetgraphgallery/variantbardatamapping.h rename to examples/graphs/3d/widgetgraphgallery/variantbardatamapping.h diff --git a/examples/graphs3d/widgetgraphgallery/variantbardataproxy.cpp b/examples/graphs/3d/widgetgraphgallery/variantbardataproxy.cpp similarity index 100% rename from examples/graphs3d/widgetgraphgallery/variantbardataproxy.cpp rename to examples/graphs/3d/widgetgraphgallery/variantbardataproxy.cpp diff --git a/examples/graphs3d/widgetgraphgallery/variantbardataproxy.h b/examples/graphs/3d/widgetgraphgallery/variantbardataproxy.h similarity index 100% rename from examples/graphs3d/widgetgraphgallery/variantbardataproxy.h rename to examples/graphs/3d/widgetgraphgallery/variantbardataproxy.h diff --git a/examples/graphs3d/widgetgraphgallery/variantdataset.cpp b/examples/graphs/3d/widgetgraphgallery/variantdataset.cpp similarity index 100% rename from examples/graphs3d/widgetgraphgallery/variantdataset.cpp rename to examples/graphs/3d/widgetgraphgallery/variantdataset.cpp diff --git a/examples/graphs3d/widgetgraphgallery/variantdataset.h b/examples/graphs/3d/widgetgraphgallery/variantdataset.h similarity index 100% rename from examples/graphs3d/widgetgraphgallery/variantdataset.h rename to examples/graphs/3d/widgetgraphgallery/variantdataset.h diff --git a/examples/graphs3d/widgetgraphgallery/widgetgraphgallery.pro b/examples/graphs/3d/widgetgraphgallery/widgetgraphgallery.pro similarity index 100% rename from examples/graphs3d/widgetgraphgallery/widgetgraphgallery.pro rename to examples/graphs/3d/widgetgraphgallery/widgetgraphgallery.pro diff --git a/examples/graphs3d/widgetgraphgallery/widgetgraphgallery.qrc b/examples/graphs/3d/widgetgraphgallery/widgetgraphgallery.qrc similarity index 100% rename from examples/graphs3d/widgetgraphgallery/widgetgraphgallery.qrc rename to examples/graphs/3d/widgetgraphgallery/widgetgraphgallery.qrc diff --git a/examples/graphs3d/widgetvolumetric/CMakeLists.txt b/examples/graphs/3d/widgetvolumetric/CMakeLists.txt similarity index 100% rename from examples/graphs3d/widgetvolumetric/CMakeLists.txt rename to examples/graphs/3d/widgetvolumetric/CMakeLists.txt diff --git a/examples/graphs3d/widgetvolumetric/doc/images/widgetvolumetric-example.png b/examples/graphs/3d/widgetvolumetric/doc/images/widgetvolumetric-example.png similarity index 100% rename from examples/graphs3d/widgetvolumetric/doc/images/widgetvolumetric-example.png rename to examples/graphs/3d/widgetvolumetric/doc/images/widgetvolumetric-example.png diff --git a/examples/graphs3d/widgetvolumetric/doc/src/widgetvolumetric.qdoc b/examples/graphs/3d/widgetvolumetric/doc/src/widgetvolumetric.qdoc similarity index 99% rename from examples/graphs3d/widgetvolumetric/doc/src/widgetvolumetric.qdoc rename to examples/graphs/3d/widgetvolumetric/doc/src/widgetvolumetric.qdoc index 1baeac32..108e17ac 100644 --- a/examples/graphs3d/widgetvolumetric/doc/src/widgetvolumetric.qdoc +++ b/examples/graphs/3d/widgetvolumetric/doc/src/widgetvolumetric.qdoc @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! - \example widgetvolumetric + \example 3d/widgetvolumetric \meta tags {Graphs, QCustom3DVolume, Custom Item} \examplecategory {Data Visualization & 3D} \title Volumetric Rendering diff --git a/examples/graphs3d/widgetvolumetric/layer_ground.png b/examples/graphs/3d/widgetvolumetric/layer_ground.png similarity index 100% rename from examples/graphs3d/widgetvolumetric/layer_ground.png rename to examples/graphs/3d/widgetvolumetric/layer_ground.png diff --git a/examples/graphs3d/widgetvolumetric/layer_magma.png b/examples/graphs/3d/widgetvolumetric/layer_magma.png similarity index 100% rename from examples/graphs3d/widgetvolumetric/layer_magma.png rename to examples/graphs/3d/widgetvolumetric/layer_magma.png diff --git a/examples/graphs3d/widgetvolumetric/layer_water.png b/examples/graphs/3d/widgetvolumetric/layer_water.png similarity index 100% rename from examples/graphs3d/widgetvolumetric/layer_water.png rename to examples/graphs/3d/widgetvolumetric/layer_water.png diff --git a/examples/graphs3d/widgetvolumetric/main.cpp b/examples/graphs/3d/widgetvolumetric/main.cpp similarity index 100% rename from examples/graphs3d/widgetvolumetric/main.cpp rename to examples/graphs/3d/widgetvolumetric/main.cpp diff --git a/examples/graphs3d/widgetvolumetric/volumetric.cpp b/examples/graphs/3d/widgetvolumetric/volumetric.cpp similarity index 100% rename from examples/graphs3d/widgetvolumetric/volumetric.cpp rename to examples/graphs/3d/widgetvolumetric/volumetric.cpp diff --git a/examples/graphs3d/widgetvolumetric/volumetric.h b/examples/graphs/3d/widgetvolumetric/volumetric.h similarity index 100% rename from examples/graphs3d/widgetvolumetric/volumetric.h rename to examples/graphs/3d/widgetvolumetric/volumetric.h diff --git a/examples/graphs3d/widgetvolumetric/widgetvolumetric.pro b/examples/graphs/3d/widgetvolumetric/widgetvolumetric.pro similarity index 100% rename from examples/graphs3d/widgetvolumetric/widgetvolumetric.pro rename to examples/graphs/3d/widgetvolumetric/widgetvolumetric.pro diff --git a/examples/graphs3d/widgetvolumetric/widgetvolumetric.qrc b/examples/graphs/3d/widgetvolumetric/widgetvolumetric.qrc similarity index 100% rename from examples/graphs3d/widgetvolumetric/widgetvolumetric.qrc rename to examples/graphs/3d/widgetvolumetric/widgetvolumetric.qrc diff --git a/src/graphs3d/doc/qtgraphs.qdocconf b/src/graphs3d/doc/qtgraphs.qdocconf index 17a41066..c1534f61 100644 --- a/src/graphs3d/doc/qtgraphs.qdocconf +++ b/src/graphs3d/doc/qtgraphs.qdocconf @@ -8,7 +8,10 @@ buildversion = Qt Graphs | Commercial or GPLv3 moduleheader = QtGraphs examplesinstallpath = graphs -exampledirs += ../../../examples/graphs3d \ + +# TODO: Unify +exampledirs += ../../../examples/graphs/ \ + ../../../examples/graphs/3d \ snippets {headerdirs,sourcedirs} += ..