From 98f0c59dd121283fae49f221222873982f34e605 Mon Sep 17 00:00:00 2001 From: Mats Honkamaa Date: Fri, 9 May 2025 09:09:34 +0300 Subject: [PATCH] Doc: Document merge of views Update docs to reflect Texture Editor and Material Editor being merged to the Properties view. Task-number: QDS-14896 Change-Id: I7c5774d00b3a5f60f70c54401dc25b00bed267f2 Reviewed-by: Johanna Vanhatapio --- .../config/style/qt5-sidebar.html | 5 +- .../examples/doc/FresnelExample.qdoc | 6 +- .../images/select-material-property.png | Bin 25355 -> 0 bytes .../studio-qtquick-3d-default-material.webp | Bin 46670 -> 63164 bytes .../studio-qtquick-3d-material-texture.webp | Bin 32476 -> 34190 bytes .../studio-qtquick-3d-texture-properties.webp | Bin 26420 -> 31186 bytes doc/qtdesignstudio/images/texture-editor.webp | Bin 37754 -> 0 bytes ...designstudio-features-on-mcu-projects.qdoc | 12 +-- .../src/qtdesignstudio-toc.qdoc | 3 +- .../qtdesignstudio-3d-editor.qdoc | 1 - .../qtdesignstudio-3d-materials-shaders.qdoc | 4 +- .../qtdesignstudio-3d-model.qdoc | 2 +- .../qtdesignstudio-3d-texture.qdoc | 10 +-- .../src/views/studio-material-editor.qdoc | 77 ++++++------------ .../src/views/studio-texture-editor.qdoc | 51 ------------ 15 files changed, 40 insertions(+), 131 deletions(-) delete mode 100644 doc/qtdesignstudio/images/select-material-property.png delete mode 100644 doc/qtdesignstudio/images/texture-editor.webp delete mode 100644 doc/qtdesignstudio/src/views/studio-texture-editor.qdoc diff --git a/doc/qtdesignstudio/config/style/qt5-sidebar.html b/doc/qtdesignstudio/config/style/qt5-sidebar.html index 163ced219fa..91c948d3622 100644 --- a/doc/qtdesignstudio/config/style/qt5-sidebar.html +++ b/doc/qtdesignstudio/config/style/qt5-sidebar.html @@ -248,7 +248,7 @@