Commit Graph

16 Commits

Author SHA1 Message Date
Eike Ziller
a2f21d40f5 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/plugins/debugger/debuggerdialogs.cpp
	src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
	src/plugins/texteditor/fontsettingspage.cpp

Change-Id: I5a6accd2065e0d8320045b57ade7b54a9a09aae0
2022-08-31 11:03:13 +02:00
Mats Honkamaa
422a20864e Doc: Update view names in documentation
Changing the following view names:
Form Editor -> 2D
3D Editor -> 3D
Connection View -> Connections
Curve Editor -> Curves
Transition Editor - Transitions

Task-number: QDS-7316
Change-Id: Id9b719b368cf5f7156319a597e94f0a3eb7c89ab
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-08-30 09:02:08 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
Leena Miettinen
226abd4de7 Doc: Do not use comma before "because"
Change-Id: I375342fa10b95e26a3de2524610905c4d5503d3e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-12 10:39:52 +00:00
Eike Ziller
536c31fd89 Doc: "New File or Project" was split into "File" and "Project"
For Design Studio

Change-Id: Ie6246e3c3f3527702c4562ec6f8fcbf5fae6c6ad
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-11-30 15:37:54 +00:00
Leena Miettinen
2c5672a3c7 Doc: Remove Cluster Tutorial docs
The videos were removed.

Change-Id: If6812255fada581ca98aecbc4c5079e21bd1677e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-15 07:14:45 +00:00
Leena Miettinen
485aad6e9e Doc: Add a reference topic for the Text Editor view
Add links to the new topic.

Change-Id: I92640385feba70a56bacfe24497eeba3d8409567
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-12 07:06:13 +00:00
Leena Miettinen
a10ee88437 Doc: Update info on component files and exporting components
- Rename "Qt Quick UI Forms" as "UI Files"
- Rename "Exporting QML" as "Exporting Components"

Task-number: QDS-3778
Change-Id: I8aa4afbb7391fe04dbcee8f68bcc6407a855b65a
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 16:42:14 +00:00
Leena Miettinen
ad0b10e695 Doc: make Qt Quick terminology more consistent
- Use "component" instead of "QML type", "item" or "element"
- Hide Qt Quick and QML where possible (kept it in some Qt Creator topics)
- Fix references to imports, assets, and modules in Library
- Add links to the new Design view topics

Task-number: QDS-3778
Change-Id: I714aeb218efd4bdc1fc2f156194bf95ce3e174b5
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-19 12:41:29 +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
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
9e915ecba0 Doc: Describe Qt Quick Designer 3D editor
- Pull source files from /doc/qtdesignstudio/srcqtquick3d-editor
- Add the necessary defines to link to additional Qt modules
- Use the same structure and files for the Qt Quick Designer parts
  as in Qt Design Studio Manual
- Move some overviews to /doc/qtcreator folder
- Fix the TOC and the navigation links

Change-Id: I2103a8e635e537fd276b3e14feeb8f50beb92cae
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-12 08:40:41 +00:00
Leena Miettinen
4a971127ac Doc: Add Qt Design Studio Manual sources
To build the manual, switch to qtcreator\doc\qtdesignstudiodoc,
run qmake, and then "make docs".

The example documentation does not get built with this change.
We need to decide whether to move the examples or fetch their
docs from the other repository.

Task-number: QDS-1487
Change-Id: Ic0a8c15b226eba8ac90686953568f3deaa000fb0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-01-20 13:54:38 +00:00