Commit Graph

87 Commits

Author SHA1 Message Date
Tim Jenßen
feabda3aa7 Merge remote-tracking branch 'origin/10.0' into qds/dev
bigger conflicts resolved at:
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
2023-03-26 16:26:18 +02:00
Mats Honkamaa
2fc079b7ec Doc: Add Material Bundle example docs
Task-number: QDS-8966
Change-Id: I95c3985458bb457e462e84d7324d07bc65a536db
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-02-09 14:47:19 +00:00
Kai Köhne
4e9c1d126c Replace GPL-3.0 with GPL-3.0-only
GPL-3.0 is deprecated by SPDX.

Change done by

 find . -type f -exec perl -pi -e 's/LicenseRef-Qt-Commercial OR GPL-3.0(?!-)/LicenseRef-Qt-Commercial OR GPL-3.0-only/g' {} \;

Change-Id: If316a498e3f27d2030b86d4e7743b3237ce09939
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-10 08:05:04 +00:00
Tim Jenssen
c9f7d893f4 Merge remote-tracking branch 'origin/9.0' into qds/dev
Change-Id: I7f394c76256d1d24fbc2d40937f3f7a63fb854c1
2022-12-06 16:31:58 +00:00
Leena Miettinen
1966591c7f Doc: Use fixed links to Qt 5 Graphical Effects
To suppress qdoc errors.

Change-Id: I48556e98c7f58d9f0b59ad47051bf166edf50387
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-25 10:02:52 +00:00
Pranta Dastider
f6d878f037 QmlDesigner: Update the wrong Timeline option text
A text was not similar in the document related to
Timeline option. This patch solves the issue.

Fixes: QDS-8263
Change-Id: I34cdb99b6e60d8a0f91baa02d0660ac9e6981523
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-11-17 12:07:59 +00:00
Eike Ziller
ea5a050c5c Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
	src/plugins/mcusupport/mcusupportsdk.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp

Change-Id: I9317da0fc1243b9ce6d87f577aa843c51f132ad7
2022-10-18 10:48:46 +02:00
Mats Honkamaa
033ec559b3 Doc: Improve wording for States and Connections pages
These topic sets cover more than adding so I change
"Adding" to "Working with".

Task-number: QDS-7995
Change-Id: I240bce10c6cbfc04a686b719bd74cbd353d3de11
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-13 12:32:58 +00:00
Pranta Dastider
0645a8aef3 QmlDesigner: Improve the UI tutorial
Change the arrangement of texts,
update images

Fixes: QDS-7761
Change-Id: I63447ce34a72e2a2df7c18053276ba1362386c00
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-12 13:36:48 +00:00
Pranta Dastider
a902729b35 QmlDesigner: Update UI Positioning document
Change in some texts, re-organized icons, and moved the
Learn more section to reduce complexity of the tutorial.

Fixes: QDS-7761
Change-Id: I504cb0a5edeee4c6798f22c1d4fd4332a8fd8c26
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-12 13:36:30 +00:00
Pranta Dastider
b30233e619 QmlDesigner: Modify States Tutorial
Change in some texts order, and trying to update
to keep it relevant for the newer version.

Fixes: QDS-7761
Change-Id: I05812f806dd56e2d11d63652d399a776599282cf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-12 13:35:48 +00:00
Tim Jenssen
964f539e55 Merge remote-tracking branch 'origin/8.0' into 9.0
resolved conflicts:
* doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc
* src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
* src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
* src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp

and compile fix in materialbrowserview.cpp

Change-Id: I686e7e93ded8ac1afc792942ded47cd9fe4341ed
2022-10-04 13:44:42 +00:00
Mats Honkamaa
7d3593fc4a Doc: Add timeline animation tutorial
Add a tutorial describing how to use timeline animation and
binding animations to properties.

Task-number: QDS-6460
Change-Id: I99a586842f6cc6fe3acb0785757eb1d2de86df54
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-03 11:19:54 +00:00
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
Mats Honkamaa
95195b416c Doc: Add creating state transition animations tutorial
Add a tutorial on how to create state transition animations
with the transition editor

Task-number: QDS-6560
Change-Id: I1bd63bc86b9d651e16fe71fbf46c8c3e934b8c77
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-05-02 11:39:13 +00:00
Mats Honkamaa
a32c857ded Create fire particle tutorial
- Rewrite the obsolete fire particle example to a tutorial and move it to
  the tutorial section
- Add links to particle system tutorials to the particle page
- Small related fixes

Task-number: QDS-6459
Change-Id: If637c9eeabd176af4ee9acdb7f2027e365a6b59a
Reviewed-by: Tanja Remes <tanja.remes@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-04-04 06:46:09 +00:00
Mats Honkamaa
9e3945e45f Doc: Update States view docs
- Updated images
- Converted jpg images to png
- Updated instructions

Task-number: QDS-6186
Change-Id: Ibaee1acd11881c49d272e9c41e11b729e3c951ec
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-03-18 09:33:45 +00:00
Mats Honkamaa
e19fa8ba96 Doc: Fix link in particle tutorial
Broken link to the particle tutorial project.

Task-number: QDS-6387
Change-Id: I26f59fb1b8f935c384219623621204009302d86f
Reviewed-by: Tanja Remes <tanja.remes@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-28 14:43:46 +00:00
Leena Miettinen
a6c44fdb1c Doc: Remove remaining referrences to Library view
The view was divided into Assets and Components views.

Task-number: QDS-6216
Change-Id: I5a73f60e511bb2936a009bbe6f61004f9d85d348
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-02-28 14:26:45 +00:00
Mats Honkamaa
2a4c149e49 Doc: Update docs related to Library, Assets, and Components view
The Library view has been removed and replaced by the Assets
and Components view.

Task-number: QDS-6216
Change-Id: Iad2454196898ca0d6631a6bd6261c02d1bad98ac
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-28 09:05:23 +00:00
Mats Honkamaa
f87c25acb5 Doc: Update particle system documentation
Update particle system documentation and add downloadable fire
particle example.

Task-number: QDS-6190
Change-Id: Id2922f536a8400029b290328c1bdc6c1bd408fd6
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>
2022-02-18 12:35:53 +00:00
Mats Honkamaa
4e10170ccd Update loginui examples folder names
Folder names need to start with capital letter.

Task-number: QDS-6160
Change-Id: I5a77e693f9bfe0d85775a7b1e71ad9d0081025a2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-03 10:40:05 +00:00
Mats Honkamaa
28a295b005 Doc: Update create project docs
Add information about the Recent tab in the create project wizard.

Task-number: QDS-5967
Change-Id: If52f96635c04529706007094aa0dbcc98c5be240
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-02 14:03:58 +00:00
Mats Honkamaa
f95636a820 Doc: Update multilanguage database docs
Update reference docs and tutorial for the multilanguage database.

Task-number: QDS-5966
Change-Id: I1aa3fa2fa8009bb0240ec787edbdc1589e87d5f1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-02 08:08:55 +00:00
Mats Honkamaa
3ecfb5739c Doc: Update all LoginUI tutorials
Update all LoginUI tutorials and the documentation for them.

Task-number: QDS-5915
Change-Id: I5a2665ca08ae3d167dfb5e937ee36c96f42ccd9a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-01 08:33:02 +00:00
Mats Honkamaa
009c91aeec Doc: Add snow and rain particle tutorial
Added a tutorial for creating a snow and a rain effect using the particle
system.

Task-number: QDS-5376
Change-Id: I498adbf78c522f7ca8faee7bba1050f970f96eef
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-13 13:24:57 +00:00
Mats Honkamaa
a3d5e27edc Doc: Add documentation for multi language function
Added description of the functionality in the Translation view as well
as a tutorial.

Task-number: QDS-5639
Change-Id: I839739058ce899c86080cf3dce7c26dc6fb83d64
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 08:33:15 +00:00
Leena Miettinen
05d7343018 Doc: Copy icons from sources to images\icons
Copy black icons with white background to be able to
turn them gray with transparent background as a first
step of making them visible in both light and dark online
doc modes.

Task-number: QDS-5693
Change-Id: I317714ba355d7c05742434fcdcafa87aef732dd4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-01-04 11:07:44 +00:00
Leena Miettinen
d420e7f5ee Doc: Fix paths to moved icons on the QDS side
- Copy missing icons from utils to doc/qtdesignstudio/images/icons
- Use gray-scale icons for keyframe icons

Task-number: QTCREATORBUG-26644
Change-Id: I3905f17317078b489ad3b33470657eb3e1fd48f5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-10 17:30:30 +00:00
Mats Honkamaa
06e1182574 Doc: Split the Examples and Tutorials Section into two pages
Splitting Examples and Tutorials to own separate pages.

Task-number: QDS-5495
Change-Id: I0014f1ab456298e9b5887b511f608725ec9d2455
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-12-01 13:15:28 +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
a99bd10860 Doc: Fix links to QDS tutorial images
Change-Id: I31315c9512e9fbad5f7462e5e82ba72666bb5719
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-10-20 13:14:13 +00:00
Leena Miettinen
0efe414100 Doc: Update fourth part of entry-level tutorial
Task-number: QDS-5001
Change-Id: Iab790f9141424ef848ddeaa2566108bf7a75d18a
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-16 14:36:49 +00:00
Leena Miettinen
d8c1dfc789 Doc: Update third part of entry-level tutorial
Task-number: QDS-5001
Change-Id: Id1c8dc919f09846a3e7d7b257e9b974f9eeecbda
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tanja Remes <tanja.remes@qt.io>
2021-09-16 14:17:11 +00:00
Leena Miettinen
40cfd78435 Doc: Update the second part of entry level tutorial
Task-number: QDS-5001
Change-Id: If171a47c5aee4c8e6f5622e8217cc137de7bb6bb
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tanja Remes <tanja.remes@qt.io>
2021-09-16 14:16:27 +00:00
Leena Miettinen
4b678f50bb Doc: Update first part of entry-level tutorial
Task-number: QDS-5001
Change-Id: I2520d843a292f80473411ee94df8253bb097b22f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-15 16:11:25 +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
93857c279c Doc: Update example docs
- Update screenshots to show the new Properties view
- Update UI text
- Add links to term definitions and topics the describe views
- Add notes about limited support for 2D effects on Qt 6

Task-number: QDS-4561
Change-Id: I0e4a94cafd968f31aae6e540cd636e03dc300cc6
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-07 06:26:46 +00:00
Leena Miettinen
525219e848 Doc: Update contents of Motion Design chapter
Add information about new topics in the chapter.
Add animation.

Change-Id: Idce4c1cad796d8df011afc16413126dba6f2583c
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2021-06-30 06:43:50 +00:00
Leena Miettinen
a3fbc85ced Doc: Create a Prototyping chapter
Restructure existing information and fix navigation links.

Fixes: QDS-4470
Change-Id: I4a1118a4620527b461b99bf05b8b06d947018c80
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-06-24 07:54:20 +00:00
Leena Miettinen
fee82ed2c2 Doc: Restructure the Wireframing chapter
Renamed from "Creating UIs"

Fixes: QDS-4469
Change-Id: Iabf436a7ed9aa87c144c29fbe39d4d5923a29ae7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-06-16 08:12:57 +00:00
Leena Miettinen
02685c691b Doc: Add information about Screen01.ui.qml
It is a custom component created by project wizard templates to give a
starting point to users. Explain that its use is optional and it can be
replaced by another main file.

Change-Id: Ica94e54ba6e307465d8ad240c5d8a590dec089a2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-20 14:03:04 +00:00
Leena Miettinen
fbdec8ce21 Doc: Add docs for SimpleKeyboard example
Fixes: QDS-4140
Change-Id: Icf1da91512848881914ac4c44e47ecc6e5bc3903
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-27 11:37:00 +00:00
Johanna Vanhatapio
2043b91ebe Doc: Add more links to topics covering views
Also some miscellaneous fixes.

Task-number: QDS-3407
Change-Id: If47cdb0b7bc16f3fc624b96c2e0dabfde2d2f2db
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-23 14:40:14 +00:00
Leena Miettinen
4f972e0296 Doc: Update Log In UI tutorial after button wizard fixes
Task-number: QDS-4211
Change-Id: Ib732386a15a4ee9361800909da9542ae73069367
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-23 09:06:10 +00:00
Johanna Vanhatapio
ac36a9616d Doc: Fix the spelling of Connection View
...and add links to the Connection View topic.

Task: QDS-3407

Change-Id: I48c2fa8e4ebbed8c8b8ddd0b68da80527d602a1d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-22 17:27:03 +00:00
Leena Miettinen
f96fd9b319 Doc: Update Log In UI tutorial part 4
Add links to new topics and the tutorial video.

Task-number: QDS-3407
Change-Id: I03b5e3b7dff69de6cd6dbb6492615e9712000460
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-04-22 13:52:48 +00:00