Commit Graph

108 Commits

Author SHA1 Message Date
Eike Ziller
381c5656e7 Merge remote-tracking branch 'origin/4.14'
Conflicts:
	src/plugins/mesonprojectmanager/project/mesonprojectparser.h

Change-Id: Id38d20ce20981dcdc322fe5d1d7647f4bec89d8a
2020-11-13 16:03:26 +01:00
Johanna Vanhatapio
450f417c0b Doc: Update Using 3D Components
Task-number: QDS-3087
Change-Id: I24d186bed1f5af475c9f641eab323df06e14b3bd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-11-11 11:41:58 +00:00
Eike Ziller
1d2b5db02f Merge remote-tracking branch 'origin/4.14'
Change-Id: I2ae0eb18782224e48cd20d41907f9dfea6ee1771
2020-11-10 13:42:46 +01:00
Leena Miettinen
df15c95fe9 Doc: Fix navigation for the Images topic
Change-Id: Ic47bab541276817ff29d5f4fa04c46cc3ebb1e87
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-11-06 14:45:47 +00:00
Leena Miettinen
750bddf286 Doc: Describe image properties
Describe the properties of the AnimatedImage, BorderImage,
and Image types.

Fixes: QDS-2850
Change-Id: I0f31f75454fb20442ddedc41f6613aeb3168cecd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-06 14:24:34 +00:00
Leena Miettinen
0d01ff7f68 Doc: Add data model, view, and delegate properties
Describe using Qt Creator/Qt Design Studio to edit data
models.

Move Path View and Svg Path docs to the new topics using
\include files.

Fixes: QDS-3030
Change-Id: I1ea09e133a4f1fe20c6e89a6323158eb1ce16c33
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-06 14:15:23 +00:00
Johanna Vanhatapio
8f69e3d317 Doc: Add the Optimal 3D Scene to examples
...and link to Creating Optimized 3D Scenes.

Fixes: QDS-3020
Change-Id: I666afca460e9e0e3afb2b612780f486a094cb45c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-05 10:42:07 +00:00
Johanna Vanhatapio
18bd2314fb Doc: Reposition the All Topics link
Fixes: QDS-2961
Change-Id: Ic7f67336a3310c743c7d31ff90506ff4f6db7725
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-10-30 09:02:56 +00:00
Johanna Vanhatapio
77b91fd4a9 Doc: Describe Best Practices in QDS
Project files for the example scene will be added as a separate task.

Task-number: QDS-1243
Change-Id: I0bc9bd861d2b6a3c58372cedb2395deb3c78f590
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-10-29 15:32:40 +00:00
Leena Miettinen
31b792a72f Doc: Add missing steps to tutorials
Streamline terminology and make some other changes
according to reviewer comments.

Change-Id: Ice84bd55fcb0ed549693c5c471827efc10a627d5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-29 09:30:08 +00:00
Leena Miettinen
03191936c4 Doc: Update information about using gradients
Describe setting properties for linear, radial, and conical
radients that are supported for Studio Components.

Add screenshots and a gif that illustrates adding and
removing gradient stops.

Change-Id: I9dfbee044b0ae37b217cc833c77f886c391292ba
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-29 09:28:31 +00:00
Eike Ziller
724fd58a3b Merge remote-tracking branch 'origin/4.14' into master
Conflicts:
	src/plugins/cppeditor/cppquickfix_test.cpp

Change-Id: I470ee35f54f883244d819531131c172bd25c0e3f
2020-10-29 09:18:31 +01:00
Leena Miettinen
652feacd5f Doc: Describe Positioner and Layout type properties
Move positioning to a separate topic.
The information in this topic is related not only to the
Library view, but also to the Properties and Form Editor
views.

Describe the properties of the Positioner and Layout types.


Change-Id: I9d00bc9498499f52ecf49463df7f651aaecf8f0e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-28 14:04:04 +00:00
Mitch Curtis
7c58a4ac5b Replace references to Qt Quick Controls 2's Default style with Basic
The Default style was renamed to Basic.

Task-number: QTBUG-85984
Change-Id: I147951c734165274561edf057292ad3192c681ea
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-12 13:16:02 +00:00
Eike Ziller
ad7dbc4619 Merge remote-tracking branch 'origin/4.13' into master
Change-Id: I565a0bd783dc80b53d4715fdc153dba1f1d3f7c7
2020-10-05 09:05:23 +02:00
Leena Miettinen
46a9e35c28 Doc: Describe properties of Studio Components (shapes)
And the basic Rectangle.

Fixes: QDS-2848
Change-Id: I6a0f506ed1f1c0ec3d065823131e7eb48445c6e2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-02 12:54:13 +00:00
Vikas Pachdha
dc64ab4859 Doc: Document rendering text as an image option
Change-Id: I4be09cb18bbaea94e278141bb786b9230d8306fd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-10-02 09:35:47 +00:00
Eike Ziller
8b031c8c05 Merge remote-tracking branch 'origin/4.13' into master
Change-Id: I3f2a6c553819e992da7e9f538dc44b95b482359e
2020-10-02 10:47:07 +02:00
Johanna Vanhatapio
b819f3fd52 Doc: Change the font of the Getting Started title
Changed the title for Getting Started section to bold on the QDS Manual front page.

Change-Id: Ia1b6eb653589a9175a7dd7ee771341f1a338a300
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-10-01 14:02:48 +00:00
Leena Miettinen
f4a11f38fa Doc: Describe basic and advanced QML type properties
These properties can be set in the Properties view for
all QML types.

Fixes: QDS-2851
Change-Id: I40743f5474eaa4255409b53106014bf916601bc4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-01 10:37:43 +00:00
Leena Miettinen
2ee1af2032 Doc: Update Qt Design Studio tutorials to use a new style
Based on the first part of the tutorial.

Change-Id: I169ea9bcd2707771fffce03a8f3678d1c73be0cd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-30 11:10:33 +00:00
Leena Miettinen
d61c6c859f Doc: Update Qt Design Studio tutorial part 1
- Explain basic Rectangle, Text, and Image types a
  bit more
- Describe how to add gradients
- Update info about asset handling

Change-Id: Ia23187f647847a16edaab3706f8bf742f09f26b1
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-30 11:10:18 +00:00
Leena Miettinen
c61b2dcdff Doc: Update Studio component docs
- The antialiasing property was removed, because it is
  inherited from Item. Keep reference to the inherited
  value.
- Fix default values.

Change-Id: I8d63801b15422de0bd78fdd82fb518a556088cfb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-29 09:13:33 +00:00
Corey Pendleton
be1a3c8b73 Doc: Update and flesh out JavaScript simulation
- Update the code examples to correct some syntax errors.
- Re-organized some steps to remove unnecessary ones and clarify the
process.

Change-Id: Ieaa061459b74154bc7a398b8686a09bb0b8a10a1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-09-29 09:12:52 +00:00
Leena Miettinen
cb8ee308ee Doc: Create separate topic for dummy QML data
There is now a collection topic for methods for
simulating data in the Qt Design Studio Manual.
Move information about creating dummy QML models
there.

Change-Id: Id15998b172169a7d714250350f6f627b998ad9e8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-29 09:10:25 +00:00
Johanna Vanhatapio
1d60300446 Doc: Describe using Simulink plugin
Fixes: QDS-2606
Change-Id: I3c6e444b6817836b2bc5783cdbb43d86e485a2ad
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-25 08:44:49 +00:00
Leena Miettinen
49d20960b9 Doc: Show "Managing Sessions" topic in QDS Manual
- Moved the topic from the creator-only folder to the
  howto folder root to have it included in the doc builds.
- Added the topic to the toc and fixed the navigation links
  around it.
- Used defines to hide text that does not apply to QDS.

Fixes: QDS-2805
Change-Id: I583324a1d0bc60c1b6448a52e48b3f09b1039b7f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-21 14:04:04 +00:00
Leena Miettinen
6e4de116bf Doc: Clarify info about installing Qt Bridge for Sketch
Fixes: QDS-2809
Change-Id: I869019d347d0726911183d2014ffa0b5a66d59e3
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-21 09:51:59 +00:00
Leena Miettinen
2e1eed1945 Doc: Add list to words to ignore for automatic linking
Change-Id: Idfa50889deeff64a8d97bfbb5deaf4c86a32e2bf
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2020-09-09 12:45:19 +00:00
Leena Miettinen
7b2dbc0cde Doc: Update info about exporting assets from Adobe Photoshop
- A button icon changed.
- The Asset format & scale settings were not described for
  Photoshop export

Change-Id: Ib446558ace6e7bbd417f0a78f311b5a8cee0b099
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-09-09 11:58:21 +00:00
Leena Miettinen
d64430b882 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>
2020-09-09 11:32:02 +00:00
Vikas Pachdha
f7634fc738 Doc: Add Qt Bridge import documentation
Change-Id: Iab73c53c4f128f54ebd4938ad24d0febb8705784
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-09-09 09:33:28 +00:00
Vikas Pachdha
81b6e06448 StudioDocs: Update Photoshop bridge plugin images
Change-Id: I71d6235e7aa5eb74b73aa2303e6e01008ddd6d8c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-08 17:33:07 +00:00
Leena Miettinen
4690f7c914 Doc: Update information about importing 2D assets using Qt Bridge
Change-Id: I2ac7ec1fe65a3e34b7174bac5fba7bbab0efa783
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-08 12:54:50 +00:00
Johanna Vanhatapio
34e5b2d0ab Doc: Update info about materials
Fixes: QDS-2753
Change-Id: I74eb64552af4ef0b222f8949291d7f6b34f0dbbb
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-09-08 10:54:10 +00:00
Leena Miettinen
86da0a006a Doc: Update change from "+" to "Create New State" label
States view layout was also changed, so update screenshots.

Change-Id: I0e4535add8720375e40fcf0e65b20061d94c5150
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-04 15:09:24 +00:00
Leena Miettinen
f1bb1bf572 Doc: Describe using uniforms in custom effects and materials
Fixes: QDS-2723
Change-Id: Iea02261220026ab210fc82fb27ceee0277abb62d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-09-04 09:58:44 +00:00
Leena Miettinen
c11c09386c Doc: Fix link to Adding Dynamics from online doc sidebar TOC
Change-Id: I7e4de42079cde8c6b7b0315968e5f17c529648e6
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2020-09-04 08:53:57 +00:00
Johanna Vanhatapio
c086c29872 Doc: Update the topic on editing 3D scenes
Task-number: QDS-2724
Change-Id: I4b9f4523e647edfafb7f052efcdf5c8c95f00687
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-09-03 13:50:26 +00:00
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