aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJohanna Vanhatapio <johanna.vanhatapio@qt.io>2020-06-29 13:31:42 +0300
committerJohanna Vanhatapio <johanna.vanhatapio@qt.io>2020-07-01 12:50:48 +0000
commit784420e9113e0078245a8485337463c190a4da8d (patch)
tree19717787adf122f54a840059ab3aa159eabd4108 /doc
parent1c30c868f139c6fe5069f120f1a33972a314f5b6 (diff)
Doc: Describe converting projects from Qt 3D Studio to Qt Design Studio
Draft of the migration guide describing the best practices and including a step-by-step guide for the converting process. Fixes: QDS-2252 Change-Id: I501b57450525cd3122510d5f9d784804996dd70f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/config/macros.qdocconf1
-rw-r--r--doc/qtcreator/src/howto/creator-ui.qdoc2
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/01-welcome-screen.pngbin0 -> 12082 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/02-create-new-project.pngbin0 -> 16450 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/03-folder-and-project-name.pngbin0 -> 17175 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/04-project-size.pngbin0 -> 9127 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/05-new-project-created.pngbin0 -> 45354 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/06-check-screen-size-in-qt3ds-project.pngbin0 -> 19613 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/07-screen-size-in-text-editor.pngbin0 -> 73713 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/08-delete-placeholders.pngbin0 -> 18264 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/09-add-new-assets.pngbin0 -> 5687 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/10-find-project-file.pngbin0 -> 26798 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/11-import.pngbin0 -> 18615 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/12-imported-image-assets.pngbin0 -> 29195 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/13-myowncluster-in-qml-types.pngbin0 -> 8058 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/14-add-myowncluster-to-project.pngbin0 -> 14594 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/15-drag-to-project.pngbin0 -> 60152 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/16-go-into-component.pngbin0 -> 42455 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/17-offending-line.pngbin0 -> 15993 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/17b-commented-out.pngbin0 -> 15238 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/18-repeat-where-needed.pngbin0 -> 36685 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/19-see-form-editor.pngbin0 -> 8943 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/20-drag-subpresentation-adas-into-layer.pngbin0 -> 28381 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/22-go-into-subpresentation-adas.pngbin0 -> 107373 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/23-replace-objects.pngbin0 -> 122759 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/24-recreate-animations.pngbin0 -> 43833 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/25-adas-timeline.pngbin0 -> 21289 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/26-recreate-2d-elements.pngbin0 -> 82079 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/27-delete-2d-layer.pngbin0 -> 55493 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/28-delete-2d-elements-from-3d-layer.pngbin0 -> 41048 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/30-find-qml-stream-files-in-file-explorer.pngbin0 -> 26643 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/31-move-under-myowncluster.pngbin0 -> 13283 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/32-rename-the-qml-stream-file.pngbin0 -> 12422 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/33-see-qml-stream-component-in-myqmlcomponents.pngbin0 -> 96299 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/34-drag-to-myowncluster-in-navigator.pngbin0 -> 73034 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/35-visible-states.pngbin0 -> 8546 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/36-recreate-qml-animations.pngbin0 -> 86778 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/37-recreate-keyframes.pngbin0 -> 33424 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/38-delete-unnecessary-folders.pngbin0 -> 82736 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/39-delete-individual-files-in-qds.pngbin0 -> 47007 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/40-done.pngbin0 -> 28198 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/41-finished-qds-project.pngbin0 -> 53674 bytes
-rw-r--r--doc/qtdesignstudio/images/exporting-from-qt3ds/porting-example-myowncluster.pngbin0 -> 64455 bytes
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc1
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc333
47 files changed, 339 insertions, 2 deletions
diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf
index 88a92778d6..3b2970724b 100644
--- a/doc/config/macros.qdocconf
+++ b/doc/config/macros.qdocconf
@@ -16,6 +16,7 @@ macro.macos = "macOS"
macro.note = "\\b{Note:}"
macro.oslash.HTML = "&oslash;"
macro.ouml.HTML = "&ouml;"
+macro.Q3DS = "Qt 3D Studio"
macro.QA = "Qt Assistant"
macro.QB = "Qt Bridge"
macro.QBPS = "Qt Bridge for Adobe Photoshop"
diff --git a/doc/qtcreator/src/howto/creator-ui.qdoc b/doc/qtcreator/src/howto/creator-ui.qdoc
index eeef2601a4..7b1bd855c0 100644
--- a/doc/qtcreator/src/howto/creator-ui.qdoc
+++ b/doc/qtcreator/src/howto/creator-ui.qdoc
@@ -32,7 +32,7 @@
/*!
\page creator-quick-tour.html
\if defined(qtdesignstudio)
- \previouspage exporting-from-maya.html
+ \previouspage exporting-from-qt3ds.html
\else
\previouspage creator-overview.html
\endif
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/01-welcome-screen.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/01-welcome-screen.png
new file mode 100644
index 0000000000..9771de9c12
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/01-welcome-screen.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/02-create-new-project.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/02-create-new-project.png
new file mode 100644
index 0000000000..0ec116bf71
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/02-create-new-project.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/03-folder-and-project-name.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/03-folder-and-project-name.png
new file mode 100644
index 0000000000..00ee4bce79
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/03-folder-and-project-name.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/04-project-size.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/04-project-size.png
new file mode 100644
index 0000000000..b0e286d72b
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/04-project-size.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/05-new-project-created.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/05-new-project-created.png
new file mode 100644
index 0000000000..73c7e5aec5
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/05-new-project-created.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/06-check-screen-size-in-qt3ds-project.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/06-check-screen-size-in-qt3ds-project.png
new file mode 100644
index 0000000000..9a5d43f03b
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/06-check-screen-size-in-qt3ds-project.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/07-screen-size-in-text-editor.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/07-screen-size-in-text-editor.png
new file mode 100644
index 0000000000..5d2c615dfe
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/07-screen-size-in-text-editor.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/08-delete-placeholders.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/08-delete-placeholders.png
new file mode 100644
index 0000000000..909778ef67
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/08-delete-placeholders.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/09-add-new-assets.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/09-add-new-assets.png
new file mode 100644
index 0000000000..e96a5982de
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/09-add-new-assets.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/10-find-project-file.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/10-find-project-file.png
new file mode 100644
index 0000000000..5c0a3060c2
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/10-find-project-file.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/11-import.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/11-import.png
new file mode 100644
index 0000000000..2310d4e73c
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/11-import.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/12-imported-image-assets.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/12-imported-image-assets.png
new file mode 100644
index 0000000000..5a1d06fb57
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/12-imported-image-assets.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/13-myowncluster-in-qml-types.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/13-myowncluster-in-qml-types.png
new file mode 100644
index 0000000000..c23e2ece27
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/13-myowncluster-in-qml-types.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/14-add-myowncluster-to-project.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/14-add-myowncluster-to-project.png
new file mode 100644
index 0000000000..b01087119d
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/14-add-myowncluster-to-project.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/15-drag-to-project.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/15-drag-to-project.png
new file mode 100644
index 0000000000..709fd5253f
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/15-drag-to-project.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/16-go-into-component.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/16-go-into-component.png
new file mode 100644
index 0000000000..2c6b677cf4
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/16-go-into-component.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/17-offending-line.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/17-offending-line.png
new file mode 100644
index 0000000000..834e8a77b6
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/17-offending-line.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/17b-commented-out.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/17b-commented-out.png
new file mode 100644
index 0000000000..fa345476f3
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/17b-commented-out.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/18-repeat-where-needed.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/18-repeat-where-needed.png
new file mode 100644
index 0000000000..98e93705d6
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/18-repeat-where-needed.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/19-see-form-editor.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/19-see-form-editor.png
new file mode 100644
index 0000000000..cd15c51790
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/19-see-form-editor.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/20-drag-subpresentation-adas-into-layer.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/20-drag-subpresentation-adas-into-layer.png
new file mode 100644
index 0000000000..a8f19c732e
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/20-drag-subpresentation-adas-into-layer.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/22-go-into-subpresentation-adas.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/22-go-into-subpresentation-adas.png
new file mode 100644
index 0000000000..efea13d058
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/22-go-into-subpresentation-adas.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/23-replace-objects.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/23-replace-objects.png
new file mode 100644
index 0000000000..a76635b15d
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/23-replace-objects.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/24-recreate-animations.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/24-recreate-animations.png
new file mode 100644
index 0000000000..4e11e79d59
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/24-recreate-animations.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/25-adas-timeline.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/25-adas-timeline.png
new file mode 100644
index 0000000000..052176a0b5
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/25-adas-timeline.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/26-recreate-2d-elements.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/26-recreate-2d-elements.png
new file mode 100644
index 0000000000..0b0978e433
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/26-recreate-2d-elements.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/27-delete-2d-layer.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/27-delete-2d-layer.png
new file mode 100644
index 0000000000..261948575f
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/27-delete-2d-layer.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/28-delete-2d-elements-from-3d-layer.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/28-delete-2d-elements-from-3d-layer.png
new file mode 100644
index 0000000000..1d7ed2590c
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/28-delete-2d-elements-from-3d-layer.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/30-find-qml-stream-files-in-file-explorer.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/30-find-qml-stream-files-in-file-explorer.png
new file mode 100644
index 0000000000..e633099b33
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/30-find-qml-stream-files-in-file-explorer.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/31-move-under-myowncluster.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/31-move-under-myowncluster.png
new file mode 100644
index 0000000000..86f582b3f1
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/31-move-under-myowncluster.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/32-rename-the-qml-stream-file.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/32-rename-the-qml-stream-file.png
new file mode 100644
index 0000000000..9cced22d29
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/32-rename-the-qml-stream-file.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/33-see-qml-stream-component-in-myqmlcomponents.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/33-see-qml-stream-component-in-myqmlcomponents.png
new file mode 100644
index 0000000000..7db3410782
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/33-see-qml-stream-component-in-myqmlcomponents.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/34-drag-to-myowncluster-in-navigator.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/34-drag-to-myowncluster-in-navigator.png
new file mode 100644
index 0000000000..54a6562d63
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/34-drag-to-myowncluster-in-navigator.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/35-visible-states.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/35-visible-states.png
new file mode 100644
index 0000000000..f79b6cee07
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/35-visible-states.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/36-recreate-qml-animations.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/36-recreate-qml-animations.png
new file mode 100644
index 0000000000..4fa191492d
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/36-recreate-qml-animations.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/37-recreate-keyframes.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/37-recreate-keyframes.png
new file mode 100644
index 0000000000..87a0e148d1
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/37-recreate-keyframes.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/38-delete-unnecessary-folders.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/38-delete-unnecessary-folders.png
new file mode 100644
index 0000000000..f521a2c556
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/38-delete-unnecessary-folders.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/39-delete-individual-files-in-qds.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/39-delete-individual-files-in-qds.png
new file mode 100644
index 0000000000..cbbc252ce5
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/39-delete-individual-files-in-qds.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/40-done.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/40-done.png
new file mode 100644
index 0000000000..5783f79c1d
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/40-done.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/41-finished-qds-project.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/41-finished-qds-project.png
new file mode 100644
index 0000000000..6859d34324
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/41-finished-qds-project.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/exporting-from-qt3ds/porting-example-myowncluster.png b/doc/qtdesignstudio/images/exporting-from-qt3ds/porting-example-myowncluster.png
new file mode 100644
index 0000000000..674f08d6da
--- /dev/null
+++ b/doc/qtdesignstudio/images/exporting-from-qt3ds/porting-example-myowncluster.png
Binary files differ
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
index 0d2de98a0f..fb79bbe41e 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
@@ -44,7 +44,9 @@
\li \l{Setting Up Qt Bridge for Sketch}
\li \l{Using Qt Bridge for Sketch}
\endlist
+ \li \l{Exporting from Blender}
\li \l{Exporting from Maya}
+ \li \l{Exporting from Qt 3D Studio}
\endlist
\li \l{User Interface}
\list
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc
index 94a949d868..1214ca81f2 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc
@@ -195,5 +195,6 @@
\list
\li \l{Exporting from Blender}{Blender}
\li \l{Exporting from Maya}{Maya}
+ \li \l{Exporting from Qt 3D Studio}{Qt 3D Studio}
\endlist
*/
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc
index e1a4ccb1b4..5d6b39a325 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc
@@ -29,7 +29,7 @@
\page exporting-from-maya.html
\previouspage exporting-from-blender.html
\if defined (qtdesignstudio)
- \nextpage creator-quick-tour.html
+ \nextpage exporting-from-maya.html
\else
\nextpage studio-importing-3d.html
\endif
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc
new file mode 100644
index 0000000000..5d588639c2
--- /dev/null
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc
@@ -0,0 +1,333 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt 3D Studio.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \page exporting-from-qt3ds.html
+ \previouspage exporting-from-maya.html
+ \nextpage creator-quick-tour.html
+ \title Exporting from Qt 3D Studio
+
+ Use the following guidelines to achieve the best results when converting
+ projects from \Q3DS to \QDS.
+
+ \section1 Best Practices
+
+ \list
+ \li If something in UI is clearly 2D, do not import it from \Q3DS
+ presentation. Implement it directly in \QDS.
+ \li QML streams cannot be imported as QML elements directly into \QDS.
+ They need to be copied manually since there is no import functionality
+ for QML files in \QDS.
+ \li If you do import the whole \Q3DS project (\c .uia file), use only the
+ parts you actually need from it. Use \uicontrol
+ {Move Component Into Separate File} for the parts you need, and
+ eventually delete all the rest from the project structure.
+ \li There are extra levels of \c Node elements in most imported QML files,
+ and they should be removed for improved performance. As a rule of thumb,
+ each Node that has only one child is considered an extra level that
+ should be deleted.
+ \li \Q3DS \e slides become \QDS \e states, and there may be problems
+ with state changes. Always go through each of the state changes to make
+ sure they work correctly.
+ \endlist
+
+ \section1 Importing Assets
+
+ \section2 Custom Materials
+ Custom materials (\e something.shader files in \Q3DS) are not imported
+ correctly, and have to be fixed manually.
+ \list
+ \li They are imported as \c {CustomMaterial { id: something; source:
+ "something" }} that neither works nor does anything.
+ \li Remove the \e {source: "something"} altogether.
+ \li Vertex shader part from the \e something.shader needs to be copied to
+ \c {Shader { stage: Shader.Vertex; shader: "vertex shader code here" }}
+ inside the \c CustomMaterial. Fragment shader part needs to be copied
+ to \c {Shader { stage: Shader.Fragment; shader: "fragment shader code
+ here" }}.
+ \li Properties in \e Metadata of the \e something.shader need to be
+ introduced manually as QML properties of the same name and correct type
+ inside the \c CustomMaterial element.
+ \li Add \c {import QtQuick3D.Materials 1.15} import statement to files that
+ have \c CustomMaterial elements.
+ \li If custom material uses textures, they are not imported automatically
+ and must be manually added to the project structure.
+ \li Many custom materials are not rendered in \uicontrol {3D Editor} or
+ \uicontrol {Form Editor} views due to an open bug in \QDS 1.5. The
+ project needs to be run for them to appear.
+ \endlist
+
+ \section2 Standard Materials
+ Some properties of standard materials may not be imported correctly.
+ \list
+ \li The sensible value ranges of some properties may have changed between
+ \Q3DS and \QDS and need to be redefined manually.
+ \li Extra properties may be added and can be removed manually.
+ \endlist
+
+ \section2 Models
+ Models have some extra properties (tessellations), which can be removed.
+
+ \section1 Example: Converting MyOwnCluster Project from \Q3DS to \QDS
+
+ \image exporting-from-qt3ds/porting-example-myowncluster.png "My Own Cluster project in Qt 3D Studio"
+ \e {My Own Cluster project in \Q3DS}
+
+ The following steps describe how to convert the My Own Cluster project from
+ \Q3DS to \QDS.
+
+ \section2 Creating a New Project in \QDS
+
+ \list 1
+ \li To create a new project in \QDS, select \uicontrol {File > New File or
+ Project}, or select \uicontrol {New Project} in the Welcome mode.
+ \image exporting-from-qt3ds/01-welcome-screen.png "Welcome mode in Qt Design Studio"
+
+ \li Creating a new project in \QDS is aided by a wizard that contains
+ templates for creating different types of projects. Choose the
+ \uicontrol {Qt Quick 3D Application} template to get started with your
+ new 3D project.
+ \image exporting-from-qt3ds/02-create-new-project.png "Create a new Project in Qt Design Studio"
+
+ \li In the \uicontrol Name field, enter a name for the project.
+ In the \uicontrol {Create in} field, enter the path for the project
+ files, and then select \uicontrol Next.
+ \image exporting-from-qt3ds/03-folder-and-project-name.png "Project location and name"
+
+ \li In the \uicontrol {Screen resolution} field, select the screen
+ resolution for previewing the UI on the desktop or on a device.
+ You must select one of the predefined screen resolutions, which will
+ later be altered to match the width and height of the original project.
+ In the \uicontrol {Qt Quick Controls Style} field, select one of the
+ predefined UI styles to use, and then select \uicontrol Finish.
+ \image exporting-from-qt3ds/04-project-size.png "Select the screen resolution for the project"
+
+ \li Your new project has now been created. For more information on
+ creating projects in \QDS, see \l {Creating Projects}.
+ For more information on how to get started with \QDS, see
+ \l {Getting Started}.
+ \image exporting-from-qt3ds/05-new-project-created.png "New project in Qt Design Studio"
+ \endlist
+
+ \section2 Getting Started with MyOwnCluster
+
+ \list 1
+ \li Return to your project in \Q3DS to check the size of the presentation.
+ Select \uicontrol {Edit} > \uicontrol {Presentation Settings} to see the
+ values for \uicontrol {Width x Height}.
+ \image exporting-from-qt3ds/06-check-screen-size-in-qt3ds-project.png "Check screen size in Qt 3D Studio presentation"
+
+ \li Adjust the canvas size of your project in \QDS according to the screen
+ size in \Q3DS presentation by editing the \c Constants.qml file in
+ \uicontrol {Text Editor}. If you cannot see the \uicontrol {Text Editor}
+ view, select \uicontrol Window > \uicontrol {Views}, and then select the
+ \uicontrol {Text Editor} checkbox. In the \uicontrol Projects view, open
+ the imports subfolder, then the subfolder named after your project, and
+ double-click \c Constants.qml. Edit the values for \e {readonly property
+ int width} and \e {readonly property int height} to match the \uicontrol
+ {Width x Height} values in \Q3DS presentation.
+ \image exporting-from-qt3ds/07-screen-size-in-text-editor.png "Adjust the canvas size"
+
+ \li To delete the placeholders created by the wizard, multiselect \uicontrol
+ Text and \uicontrol view3D components (\key Ctrl + mouse left click) in
+ \uicontrol Navigator, then right click on the selected items, and select
+ \uicontrol Edit > \uicontrol Delete.
+ \image exporting-from-qt3ds/08-delete-placeholders.png "Delete placeholders in Navigator"
+ \endlist
+
+ \section2 Importing Assets
+ \list 1
+ \li In the \uicontrol Library view, select \uicontrol {Add New Assets}.
+ \image exporting-from-qt3ds/09-add-new-assets.png
+
+ \li Select the \c .uia file for the \Q3DS project you wish to import, and
+ then select \uicontrol Open.
+ \image exporting-from-qt3ds/10-find-project-file.png "Find the uia file in file explorer"
+
+ \li Select \uicontrol Import, and after the import is complete, select \uicontrol
+ Close.
+ \image exporting-from-qt3ds/11-import.png "Import the file"
+
+ \li The 2D assets imported from \Q3DS now appear in \uicontrol Library
+ under \uicontrol Assets tab.
+ \image exporting-from-qt3ds/12-imported-image-assets.png "Imported assets in Library"
+
+ \li The QML components generated from the imported \Q3DS project now appear
+ as available imports in \uicontrol Library under \uicontrol {QML Types}.
+ Select \uicontrol Quick3DAssets.MyOwnCluster to import them to your
+ project.
+ \image exporting-from-qt3ds/13-myowncluster-in-qml-types.png "Available imports in QML Types"
+
+ \li The imported QML types now appear in \uicontrol Library and can be added
+ to the project.
+ \image exporting-from-qt3ds/14-add-myowncluster-to-project.png "MyOwnCluster in Library"
+ \endlist
+
+ \section2 Adding Components to the Project
+
+ \list 1
+ \li Drag \uicontrol MyOwnCluster from \uicontrol {My Quick3D Components}
+ in \uicontrol Library to \uicontrol {Form Editor}.
+ \image exporting-from-qt3ds/15-drag-to-project.png "Drag MyOwnCluster to Form Editor"
+
+ \li In \uicontrol Navigator, right click on myOwnCluster and select \uicontrol
+ {Go into Component}.
+ \image exporting-from-qt3ds/16-go-into-component.png "Go into component My Own Cluster"
+
+ \li Find the offending line in \uicontrol {Text Editor}.
+ \image exporting-from-qt3ds/17-offending-line.png
+
+ \li Comment out the offending line by placing two slashes in the beginning
+ of it (or remove the line).
+ \image exporting-from-qt3ds/17b-commented-out.png
+
+ \li In Navigator, go to each component of the project and comment out
+ (or remove) any offending lines you find.
+ \image exporting-from-qt3ds/18-repeat-where-needed.png
+
+ \li You should now see some parts of the project in \uicontrol {Form Editor}.
+ \image exporting-from-qt3ds/19-see-form-editor.png "Project in Form Editor"
+ \endlist
+
+ \section2 Converting 3D Elements
+
+ \list 1
+ \li Drag subpresentation_ADAS from \uicontrol {My QML Components} in \uicontrol
+ Library into layer folder in \uicontrol Navigator.
+ \image exporting-from-qt3ds/20-drag-subpresentation-adas-into-layer.png "Drag into layer"
+
+ \li To delete the old subpresentation rectangle, right-click on the file
+ name (subpresentation_ADAS2_u52017 in this project), select
+ \uicontrol Edit > \uicontrol Delete.
+
+ \li Go into the component subpresentation_ADAS.
+ \image exporting-from-qt3ds/22-go-into-subpresentation-adas.png "Go into component"
+
+ \li Reposition objects and/or camera in \uicontrol {3D Editor} according to
+ the original \Q3DS project. The desired scene may be achieved
+ simply by changing the z position sign from positive to negative, or
+ vice versa, in some cases.
+
+ For more information on how to edit a scene in \uicontrol {3D Editor},
+ see \l {Working in 3D Editor}.
+ \image exporting-from-qt3ds/23-replace-objects.png "Replace objects in 3D Editor"
+
+ \li Recreate animations in subpresentation_ADAS according to the original
+ project. For more information on creating animations in \QDS, see
+ \l {Creating Animations}.
+ \image exporting-from-qt3ds/24-recreate-animations.png "Recreate animations"
+
+ \li Go to the \uicontrol Timeline View to review the timeline for the
+ project.
+ \image exporting-from-qt3ds/25-adas-timeline.png "ADAS timeline view"
+ \endlist
+
+ \section2 Converting 2D Elements
+
+ \list 1
+ \li Recreate the 2D elements of the original project (in all layers) using
+ the 2D QML elements available in \QDS. You can use the imported 2D layer
+ as a guide for recreating the elements. If the 2D elements in the
+ original project have rotations, especially in a 3D layer, make sure to
+ add rotations that mimic the original ones to the \QDS project. For
+ example, rotation on one axis with perspective camera requires rotation
+ on two axes in pure 2D. You may need to use \uicontrol {Text Editor}
+ to achieve rotation similar to the rotation of the object in \Q3DS.
+ For more information on specifying advanced transformations on
+ \uicontrol Items, see \l Transform.
+ \image exporting-from-qt3ds/26-recreate-2d-elements.png "Recreate 2D elements"
+
+ \li To delete the 2D layer (telltaleLayer_u39332) in \uicontrol Navigator
+ after recreating the 2D elements, right-click on the component, and
+ select \uicontrol Edit > \uicontrol Delete.
+ \image exporting-from-qt3ds/27-delete-2d-layer.png "Delete the 2D layer"
+
+ \li Next, you need to delete the 2D elements from the 3D layer (speed_u20335
+ and rPM_u10371 from layer_32325). Right-click on the element, and
+ select \uicontrol Edit > \uicontrol Delete.
+ \image exporting-from-qt3ds/28-delete-2d-elements-from-3d-layer.png "Delete old 2D elements from the 3D layer"
+
+ \li Recreate the animations for 2D elements the same way it was done for the
+ 3D elements.
+ \endlist
+
+ \section2 Converting QML Streams
+
+ \list 1
+ \li Find QML stream files in file explorer.
+ \image exporting-from-qt3ds/30-find-qml-stream-files-in-file-explorer.png "Find the QML stream file"
+
+ \li Move the QML stream files under the import's main folder (one level up
+ in this example).
+ \image exporting-from-qt3ds/31-move-under-myowncluster.png "Move the QML stream files under the import's main folder"
+
+ \li Make sure that the QML stream file names start with a capital letter
+ to enable \QDS to recognize them as QML component files.
+ \image exporting-from-qt3ds/32-rename-the-qml-stream-file.png "The QML stream file names should start with a capital letter"
+
+ \li Return to \QDS and enter the MyOwnCluster component. The QML stream
+ component now appears in \uicontrol {My QML Components}.
+ \image exporting-from-qt3ds/33-see-qml-stream-component-in-myqmlcomponents.png "QML stream in My QML Components"
+
+ \li Drag and drop the QML stream component to MyOwnCluster in \uicontrol
+ Navigator.
+ \image exporting-from-qt3ds/34-drag-to-myowncluster-in-navigator.png "Drag the QML stream component to MyOwnCluster"
+
+ \li Go to the \uicontrol States view and use the \uicontrol Visibility tab
+ in the \uicontrol Properties view to make the QML stream component
+ visible only in the correct state.
+ \image exporting-from-qt3ds/35-visible-states.png "Make components visible in correct states"
+
+ \li Next, recreate the animations for the QML stream according to the original project.
+ \image exporting-from-qt3ds/36-recreate-qml-animations.png "Recreate animations"
+
+ \li Recreate all the keyframes for the imported QML stream that is now a
+ component.
+ \image exporting-from-qt3ds/37-recreate-keyframes.png "Recreate keyframes"
+ \endlist
+
+ \section2 Cleaning Up the Project Structure
+
+ \list 1
+ \li Go to file explorer and clean up the project structure deleting
+ the folder and files that are not used in the \QDS project.
+ \image exporting-from-qt3ds/38-delete-unnecessary-folders.png "Delete folders in file explorer"
+
+ \li Individual files can also be deleted in the \uicontrol {Projects} view
+ in \QDS. To delete a file, right-click on it, select \uicontrol
+ {Delete File}, and then select \uicontrol Yes.
+ \image exporting-from-qt3ds/39-delete-individual-files-in-qds.png "Delete individual files"
+
+ \li This is the project structure after clean-up.
+ \image exporting-from-qt3ds/40-done.png "Project structure after clean-up"
+ \endlist
+
+ \section2 Finished
+
+ You have now converted your \Q3DS project to \QDS.
+ \image exporting-from-qt3ds/41-finished-qds-project.png
+*/