Commit Graph

419 Commits

Author SHA1 Message Date
Johanna Vanhatapio
6272039221 Doc: Describe 3D Materials
Fixes: QDS-2677
Change-Id: Ia0e617084e4614c194fce0f53c58a6013831cad2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-09-03 10:07:19 +00:00
Johanna Vanhatapio
ac55948c76 Doc: Update topic on working in 3D Editor
Fixes: QDS-2655
Change-Id: If8e5e1051ceca8b405facdf36747c4d887d830bf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-03 09:40:45 +00:00
Leena Miettinen
1074dab467 Doc: Update info about exporting 2D assets from Sketch
Change-Id: Iec58bb071cdde7eaab3d84f6d06f9d646f341524
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-09-03 08:49:15 +00:00
Leena Miettinen
32dfddbf78 Doc: Stop QDoc from automatically generating a broken link
Fixes: QDS-2714
Change-Id: I9ae35a4a7436c743e448c0167c21f1080b8afe79
Reviewed-by: Asmo Saarela <asmo.saarela@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-09-02 11:47:30 +00:00
Leena Miettinen
ed4704e0b4 Doc: Describe creating custom effects and materials
...using Qt Quick 3D custom shader utilities and commands

Fixes: QDS-2613
Change-Id: I5807c1617d2b54b3fba183c1278ec1266f899c70
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-02 07:17:50 +00:00
Johanna Vanhatapio
980ba0d83d Doc: Describe custom shader utilities
Using the utilities will be described in another change.

Task-number: QDS-2613
Change-Id: I41ca69f84df6e977e41ff30508c8a77d779e1c01
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-01 14:27:35 +00:00
Leena Miettinen
6181399187 Doc: Use local value for \QMLD macro in Qt Design Studio Manual
This enables us to get rid of the product name "Qt Quick Designer"
in Qt Design Studio context. However, the macro can no longer be
used for UI text. Actually, it does not make much sense, because the
UI text is not dynamic. It would be good to also replace it in the
UI with something more generic, or with "Form Editor", for example.

Change-Id: I5884f090f915d5ff0c64428239bfd324cd1941c2
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-28 10:06:06 +00:00
Leena Miettinen
ce19b108d1 Doc: Add the folder where the Qt Bridge installers are found
The installers are copied to the QtDesignStudio folder by the
Qt online installer.

Task-number: QDS-2542
Change-Id: Ib5e9bbb3c7a2cf03a4abd3e8b39759173a37ad5a
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-08-27 06:39:58 +00:00
Leena Miettinen
2d12e6b119 Doc: Update Qt Quick Designer overview
Update screenshot.

Change-Id: I5be9abd2e741e738718b7dcbb589ad4425e54e67
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-25 06:59:41 +00:00
Leena Miettinen
3d68fa647c Doc: Update info on using Custom Button wizard template
...to create buttons in Qt Design Studio

Update some of the tutorial source files accordingly.

Change-Id: Id8afc9bf66c30129701bf7951cbc48068137e145
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-17 08:53:10 +00:00
Johanna Vanhatapio
7634282896 Doc: Fix missing image
Fixes: QDS-2622
Change-Id: Ie9b8ec1f8a15e8be9c70e7f2ef65e8ee6b1c5470
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-08-14 07:30:08 +00:00
Johanna Vanhatapio
3e1d204c32 Doc: Edit Maya export options
Fixes: QDS-2124
Change-Id: Iefc42fdcc168c7eb41220525a2ef061541fa066f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-08-13 08:38:10 +00:00
Johanna Vanhatapio
7d68707a01 Doc: Describe the 3D effects in QDS
Fixes: QDS-2224
Change-Id: I8d5737af34805e75eb74a3fe86591f86e99b6d4b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-08-11 12:44:56 +00:00
Leena Miettinen
ed95b3e6a1 Doc: Add info about IncrediBuild plugin
Fixes: QTCREATORBUG-24217
Change-Id: I3e9023933db508f14139b719eae0191d4615eab7
Reviewed-by: hjk <hjk@qt.io>
2020-08-11 07:53:36 +00:00
Leena Miettinen
7f436e23ac Doc: Add "Setting Up Meson" to "All Topics"
To display it correctly in the Help Contents.
Also exclude the topic from the Qt Design Studio Manual build.

Change-Id: I2536ef7214faf12c3e1ff533449db12f87a58aeb
Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-07-03 06:20:33 +00:00
Johanna Vanhatapio
784420e911 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>
2020-07-01 12:50:48 +00:00
Leena Miettinen
41a69be366 Doc: Clarify what happens during export and import with Qt Bridge
Fixes: QDS-2433
Change-Id: Ia30957863c7200eb0438db4e271e5c2be0208637
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-07-01 06:41:16 +00:00
Leena Miettinen
a8cfe3d560 Doc: Fix menu paths to submenus and items that moved to View menu
The Views and Workspaces menus as well as some menu items were moved
from Windows to View.

Change-Id: I2e196c09f0e9e2bf8ef1623167ec3e87ed1f77f5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-30 10:35:07 +00:00
Leena Miettinen
004bef4909 Doc: Update entry-level tutorials
Fixes: QDS-2304
Change-Id: Ib3417b40a19767d79b36bd920d21ae50b903a554
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-26 09:52:20 +00:00
Leena Miettinen
71129c9aaa Doc: Describe missing steps in flow view docs
Also describe applying states in flow views.

Change-Id: Icda4559c95f9319845d6c413b33ad5e4016fad5e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-22 06:26:31 +00:00
Leena Miettinen
80b04b8248 Doc: Describe designing application flows in Design mode
Fixes: QDS-1541
Change-Id: I8b4c83f6548414063670303d2d83e7dd5f93d0d8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-18 09:35:59 +00:00
Johanna Vanhatapio
bfc02970ae Doc: Edit Maya export options for FBX files
Task-number: QDS-2125
Change-Id: I9397870d577f8f64c217a98a15c9bc00e3907731
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-06-17 10:55:54 +00:00
Eike Ziller
c644e7c80a Merge remote-tracking branch 'origin/qds-1.59'
Conflicts:
	src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
	src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp

Change-Id: Ifa7c66330c1995378280cdb4c57c30015dc11b68
2020-06-08 16:04:15 +02:00
Johanna Vanhatapio
54f53898bf Doc: Change the link to info on exporting 3D assets
Change-Id: I6ba7933928563343ea0f3420f1cb3b47bc262360
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-06-05 13:13:07 +00:00
Leena Miettinen
891524d4c4 Doc: Hide advanced information from Qt Design Studio Manual
Replace references to "developers" and "designers" with "you"
where the difference is not important.

Hide some complexity by removing references to features designers
might not use very often, such as the locator and debugger.

Fixes: QDS-2159
Change-Id: Ifcda176c5c429a4d90f37138d861cb971932e626
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Soili Väinämö <soili.vainamo@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-04 10:30:08 +00:00
Tim Jenssen
b193892fd1 Merge remote-tracking branch 'origin/4.12' into qds-1.50
Change-Id: I8e4155aa2a0a8c7f7405dd79e856380011e23a33
2020-05-27 18:59:53 +02:00
Leena Miettinen
d4a1f1ae90 Doc: Describe exporting assets from Adobe Illustrator
There are some tricks the users need to know.

Fixes: QDS-1745
Change-Id: Ie6ea417335ed47b7960636fccc5946f8f5e6024a
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-27 15:22:48 +00:00
Leena Miettinen
197ccb9bda Doc: Resize front page images to remove scrollbar
Change-Id: I8555bd5f7952530a02d57be436fc27c8a04de0be
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-05-26 14:06:52 +00:00
Topi Reinio
73d45a994b Doc: Ensure QDoc finds Qt Design Studio examples
The name of the example project directory must match with
the project file name and the \example command argument.
This is case sensitive on platforms other than Windows.

Change-Id: Ie6fa6934ee444b42f024ebf00d6a9b20dfd6abce
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-05-18 10:15:03 +00:00
Tim Jenssen
aa79d30b83 Merge remote-tracking branch 'origin/4.12' into qds-1.50
Change-Id: Ia70d4b47f578021f29197a22b3e07e792342d05c
2020-05-15 17:20:20 +02:00
Leena Miettinen
37421b342f Doc: Add missing punctuation
Change-Id: If0af93ec6f64fc5c48c33df87cf37b4189dfc72e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-05-15 14:06:13 +00:00
Leena Miettinen
564bace1ec Doc: Describe SpotLight Qt Quick 3D type
Update screenshots of all light types in 3D Editor.

Task-number: QDS-2056
Change-Id: I5f4fbacd01850c7cedcbd187969b9f310507649c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-05-15 13:27:03 +00:00
Johanna Vanhatapio
921b56cd46 Doc: Update information about views for editing 3D assets
Task-number: QDS-2056
Change-Id: Iee6aab42c4cd6d97d99eafc3599e55828f0d9657
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-05-15 09:01:24 +00:00
Leena Miettinen
3819b766a4 Doc: Update information about project wizards
Qt Quick 3D, Flow Item and Flow view wizards have been added,
the Qt for MCUs wizard is now included in Qt Design Studio,
and the font loader wizard has been removed.

Task-number: QDS-2056
Change-Id: Ie5d42320661977d57767c3bf58fd480e7d6c3c8d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-15 08:04:05 +00:00
Johanna Vanhatapio
1d257e60d1 Doc: Update information about 3D Editor
Change-Id: I047b96e1db411ccbbe73a94f701cc7e632bc98c9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-05-15 06:06:26 +00:00
Leena Miettinen
c59e8ce651 Doc: Update information about Scene Environment properties
"Blend mode" field seems to have been removed.
The Skybox option has been added to "Background mode" field.

Task-number: QDS-2056
Change-Id: Ie5c5b5fae4aba83bd8b9b50357bb83d58fbb69c2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-14 14:39:03 +00:00
Leena Miettinen
f51258a17c Doc: Move Qt Bridge product name macros to the common macros file
..from the Qt Design Studio Manual doc configuration file.

Change-Id: Iebbfb5404cae4ef277f05c867e7259997b19a27e
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-05-14 10:18:31 +00:00
Vikas Pachdha
f362304169 Add library export documentation for Sketch Qt-bridge
Task-number: QDS-2046
Change-Id: Idca24fdac106da1b6631518ddd9bb9fa7253a8c7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-05-13 11:45:46 +00:00
Leena Miettinen
a12669292e Doc: Remove link to non-existing tutorial
Part 5 is still a work-in-progress.

Change-Id: I7c8cd07be3921b9fd36eeb913d9e393e6f15d895
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-13 09:49:50 +00:00
Leena Miettinen
795fb5f59d Doc: Update info about QML types supported by Qt Quick Designer
Update screenshots.

Change-Id: If079a93940dc103b4afa283f01c94825d895bfa3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-12 15:04:22 +00:00
Leena Miettinen
c370d345f1 Doc: Remove obsolete \contentspage command
This prints a QDoc warning when building with QDoc 5.15.

Change-Id: Id6f4646738f3e09956a243dc0da639f5567470f3
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-05-11 08:43:31 +00:00
Leena Miettinen
9179743464 Doc: Fix terms used for Design mode views
The "canvas"/"scene"/"stage"/"working area" is called "Form Editor view".
Library, Navigator, Projects, Properties, States, Text Editor,
and Timeline are also their own views that can be organized as
workspaces and open from the Windows menu.

There are "tabs" only within views, and "panes" refers to
output panes.

Change-Id: I55898eef99b87245e4ab9b0163943725a90615a3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-06 16:27:14 +00:00
Leena Miettinen
937d3d3a70 Doc: Add Qt Design Studio example documentation
From Qt Design Studio 1.4. Add .qdoc and .qmlproject files,
quoted .qml files, and .png files.

Edit the files as necessary to reflect changes in version 1.5
and to reduce image file size.

Task-number: QDS-1519
Change-Id: I3bbdec0d3b4acf904c0008d1566dad13707e9851
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-06 16:26:11 +00:00
Johanna Vanhatapio
00200d8b90 Doc: Describe 3D Editor local and global orientation mode
Change-Id: Ibe281ba6d06c68a9c5f36a743563b6fc40fe7e0a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-05-04 12:24:25 +00:00
Leena Miettinen
b18587742f Doc: Describe downloading Qt Bridge from Qt Marketplace
Adjust the info about exporting and importing assets.

Change-Id: Ibc66fac68e14483fda050b7501fc7e091115ce89
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-04 06:56:22 +00:00
Tim Jenssen
081186811d qds: remove workaround when qdocconf was somewhere else
After moving the QtDesignStudio documentation to the QtCreator
repository there is no need for these extra files in the dev
packages.

Change-Id: I4e24946bb6752403a6ecafb0c474332ad2317b1a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-24 08:34:16 +00:00
Leena Miettinen
169c3bb30c Doc: Fix path to image files
Change-Id: I8f9395bd5d8c5ae02e1bb994577b02c80c4c2564
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-23 12:42:47 +00:00
Leena Miettinen
f21f7e97fc Doc: Move information about using Form Editor to separate topic
Rewrite information about the Qt Quick Editor to take new
workspace concept and 3D editor into account.

Task-number: QTCREATORBUG-23364
Change-Id: I053685b5e603ad75af3f7314c30e627fac5c6207
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-22 07:12:30 +00:00
Leena Miettinen
97560e1ca6 Doc: Fix 3D editor icon filenames
Task-number: QTCREATORBUG-23364
Change-Id: I0cfe1b5040eea9675f9b7508c5a6486beffd5adb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-04-09 13:57:46 +00:00
Leena Miettinen
12a8016476 Doc: Update info on Qt Quick 3D materials and shaders
Task-number: QDS-1651
Change-Id: I510f954387b4f13b23755059cc6c6a9961b53c36
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-07 14:16:32 +00:00