diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-12 09:59:55 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-12 09:59:55 +0200 |
| commit | c9b56717542749b271d5e48c7bf7698884e94f8f (patch) | |
| tree | 424aabcf1197798d2294cb05eb047d51c4f82bce /doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc | |
| parent | 6ab2f93f184470998e452cd709a881258dfef6a0 (diff) | |
| parent | 8e1169f4bf6fc97f7f864cefeb5a273f271798cf (diff) | |
Merge remote-tracking branch 'origin/4.12' into qds-1.50qds/v1.5.0-rc1
Change-Id: Iee9542b518367018b6e672ff920bfdb411639f8b
Diffstat (limited to 'doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc')
| -rw-r--r-- | doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc index 48f853c97e..bcef409407 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc @@ -26,7 +26,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \page studio-3d-materials.html \previouspage studio-3d-model.html \nextpage studio-3d-texture.html |