aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2020-09-09 12:21:33 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2020-09-09 11:32:02 +0000
commitd64430b882dd3698e60849c9db811390be2a0408 (patch)
treebaa0f63e089e9fd7f9c5dbc3f6ee1a2c79492ac0
parent24f35037d19ff1560823c02bef7fa222784aa94e (diff)
Doc: Make "Exporting QML" topic visible in Qt Design Studio Manual
The Build > Export QML menu item is available in Qt Design Studio Change-Id: I5f29410de5d6d13c427b9907937c4d82e111fe06 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-export.qdoc (renamed from doc/qtcreator/src/qtquick/creator-only/qtquick-export.qdoc)4
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc3
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-uis.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc6
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc1
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio.qdoc1
6 files changed, 14 insertions, 3 deletions
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-export.qdoc b/doc/qtcreator/src/qtquick/qtquick-export.qdoc
index db641f080f..f3adc6b50f 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-export.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-export.qdoc
@@ -26,7 +26,11 @@
/*!
\page creator-exporting-qml.html
\previouspage quick-converting-ui-projects.html
+ \if defined(qtdesignstudio)
+ \nextpage quick-uis.html
+ \else
\nextpage creator-using-qt-designer.html
+ \endif
\title Exporting QML
diff --git a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
index 3184955033..57bdaf64d3 100644
--- a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
@@ -27,11 +27,10 @@
\page quick-converting-ui-projects.html
\if defined(qtdesignstudio)
\previouspage studio-importing-3d.html
- \nextpage quick-uis.html
\else
\previouspage creator-qml-modules-with-plugins.html
- \nextpage creator-exporting-qml.html
\endif
+ \nextpage creator-exporting-qml.html
\title Converting UI Projects to Applications
diff --git a/doc/qtcreator/src/qtquick/qtquick-uis.qdoc b/doc/qtcreator/src/qtquick/qtquick-uis.qdoc
index 5a80438259..3905fb06e6 100644
--- a/doc/qtcreator/src/qtquick/qtquick-uis.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-uis.qdoc
@@ -26,7 +26,7 @@
/*!
\page quick-uis.html
\if defined(qtdesignstudio)
- \previouspage quick-converting-ui-projects.html
+ \previouspage creator-exporting-qml.html
\nextpage studio-app-flows.html
\else
\previouspage creator-using-qt-quick-designer.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc
index 036879ad63..707fec1ce4 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc
@@ -67,5 +67,11 @@
to Qt Quick Application projects that contain .pro, .cpp, and .qrc
files.
+ \li \l {Exporting QML}
+
+ You can export UI forms (ui.qml files) to JSON metadata format
+ and PNG assets to generate native file formats in content creation
+ tools, such as Adobe Photoshop, using \QB.
+
\endlist
*/
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
index 6a32c95123..a758f444d4 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
@@ -68,6 +68,7 @@
\li \l{Importing 3D Assets}
\endlist
\li \l{Converting UI Projects to Applications}
+ \li \l{Exporting QML}
\endlist
\li \l{Creating UIs}
\list
diff --git a/doc/qtdesignstudio/src/qtdesignstudio.qdoc b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
index 4ad8ecb22f..ae9dda9f96 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
@@ -54,6 +54,7 @@
\li \l{Using Git}
\li \l{Importing Designs}
\li \l{Converting UI Projects to Applications}
+ \li \l{Exporting QML}
\endlist
\li \b {\l{Creating UIs}}
\list