Commit Graph

4063 Commits

Author SHA1 Message Date
Eike Ziller
b402f35481 Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
	doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
	src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp
	src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designercore/model/import.cpp
	src/plugins/qmldesigner/designercore/model/model_p.h
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
	src/plugins/qmlprojectmanager/qmlproject.cpp

Change-Id: I4236bf0da9306abf201f4679259e72dd7c1eddbe
2022-11-01 15:38:49 +01:00
Leena Miettinen
d173f532c7 Doc: Describe conditions for automatically finding ccache on macOS
Task-number: QTCREATORBUG-27876
Change-Id: I01f671c3f2b36e97c56ce3649ef5ab38d1a067c3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-31 08:47:05 +00:00
Leena Miettinen
18553f051c Doc: Remove \if defined statements from files not used in QDS
Change-Id: Ib6c3bf5a89faab97fd28b47e033925c2f4f30f55
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-31 07:38:50 +00:00
Leena Miettinen
5759da754e Doc: Use filename extension of ok.png to fix qdoc warnings
Change-Id: Ic33d9c4e8a3af523e087fc1284cb374e7fd37ec0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-27 14:31:23 +00:00
Leena Miettinen
596529651b Doc: Fix link to Qt 6 based Qt Design Viewer
Change-Id: I68a10b4508feb6760f28ef63d29fa54bc1ae37f3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-10-27 13:06:17 +00:00
Leena Miettinen
86a24b707d Doc: Add info and examples of using CMake presets
Task-number: QTCREATORBUG-27876
Change-Id: Iaaea164d7a8395d6ddc7580db72790187b719eda
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-27 06:44:48 +00:00
Leena Miettinen
642ba31f8b Doc: Describe "Show subfolders inside source group folders"
...in Preferences > CMake.

Task-number: QTCREATORBUG-27876
Change-Id: I0d71e0281413433e6acfdd7023c138c422a8712f
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-10-26 08:32:26 +00:00
Mats Honkamaa
552831ead4 Doc: Update documentation on how to share apps online
Provide basic information and instructions about sharing applications online

Task-number: QDS-7155
Change-Id: I69632f370a452c1b9cc03ebac260f0382a89449b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-25 11:23:20 +00:00
Leena Miettinen
85cf6f3365 Doc: Describe Configuration field in CMake build settings
Update screenshots.

Task-number: QTCREATORBUG-27876
Change-Id: Ib0424bef44ac29078a86445da5032011ffc7ff94
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-10-24 12:19:52 +00:00
Leena Miettinen
4fee43c76f Doc: Use "which" in clauses that add supporting information
Fixes: QTCREATORBUG-28364
Change-Id: I98bbff1886fc63d024dd9ce57720274b598bf6de
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-24 09:26:01 +00:00
Mats Honkamaa
1ac0acbd7f Doc: Update states view documentation
There is a new states view, documentation need to be updated.

Task-number: QDS-7892
Change-Id: I17ac7c192d4a8ddf0a10da6c8e399b126dabfebe
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-24 06:53:48 +00:00
Leena Miettinen
59b92b6417 Doc: Create separate topics for Qt Design Viewer in QC and QDS manuals
The process in the two apps now differs too much for single-sourcing
the docs to be helpful.

Change-Id: I3aa60c9f2219d19843f5a4c635fc49c83548f13f
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-10-21 13:24:00 +00:00
The Qt Project
e04edf5b1e Merge "Merge commit '029f926bcfcbb01' (origin/8.0) into 9.0" into 9.0 2022-10-20 14:05:56 +00:00
Eike Ziller
7b449c9463 Merge commit '029f926bcfcbb01' (origin/8.0) into 9.0
Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp

Change-Id: Iff498a1024f4a152ebdd3516ba13fa16cb6932d9
2022-10-20 15:01:00 +02:00
Leena Miettinen
4c936be3a9 Doc: Update Image Viewer snapshot and add icons to instructions
Arranged the feature list according to the order of icons on the
toolbar and added icons.

Edited some text.

Task-number: QTCREATORBUG-27876
Change-Id: I4357329fbc137ea39b87e3630de507981d1611e5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-20 12:31:00 +00:00
Leena Miettinen
b4c3431768 Doc: Fix qdoc command \section to \section1
Change-Id: I500a5dc5e84e19e975904cc5d04a465f736dc86b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-20 11:43:09 +00:00
Mats Honkamaa
029f926bcf Doc: Fix 3D effect docs
Task-number: QDS-8026
Change-Id: Ic59b58e8d0c033b2fc6ec1e18d0ca4ddcfe63699
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-19 09:57:26 +00:00
Robert Loehning
f27444a213 Doc: Rephrase code snippet description
...to also cover the case of writing new bug reports.

Change-Id: Ia98231c836df256313f7b7cb42f3e05bf3b8866b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-18 12:41:32 +00:00
Leena Miettinen
4ebfd4b6cf Doc: Update instructions for adding B2Qt Devices
Update screenshots to use the dark mode.

Task-number: QTCREATORBUG-27876
Change-Id: I1b6483f76d7f14485ffc13b465e84f378494ea3f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-10-18 12:27:23 +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
Leena Miettinen
31e24208b5 Doc: Describe using CMake presets for configuring and building
Update screenshots.

Task-number: QTCREATORBUG-27876
Change-Id: I62135a0254b730b2cbbad65f5bac7b1594ee454e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-10-18 06:38:57 +00:00
Leena Miettinen
8aaf60218c Doc: Add alternative terms for "shadow build" to the glossary
Change-Id: I36e160840520778f5ef7012ef72fb1abb967a3c5
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-18 06:38:43 +00:00
Leena Miettinen
de357a138e Doc: Update docs after CMake preferences were moved to separate category
...from tabs in Build & Run and Kits categories.

Task-number: QTCREATORBUG-27876
Change-Id: I4f808eaaa32fa978e3ef06d0a3f2a9739d8ef726
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-10-14 14:21:40 +00:00
Leena Miettinen
c51ca1fd82 Doc: Improve quality of Squish plugin icons
And add the button name to text to help users find it in UI.

Change-Id: I3d7096ac13855b697c97f6affe146a088241259a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-14 09:16:45 +00: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
Leena Miettinen
b4d0db920a Doc: Update instructions for writing documentation
For new and updated images, use the display resolution 1920x1080.

Change-Id: Ie7a83d23eacfa8ba9b78a4de4ee9046e838fa72c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-13 11:55:40 +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
Leena Miettinen
51e31713ff Doc: Describe the Hide/Show Right Sidebar button in build output
Task-number: QTCREATORBUG-27876
Change-Id: Ie0804bccb034d138afd1cca5facbc1bd3cae8cb3
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-12 07:15:12 +00:00
Leena Miettinen
5741d8ec05 Doc: Describe Follow Symbol Under Cursor to Type in code editor
Task-number: QTCREATORBUG-27876
Change-Id: I17250cdde3ad4c722dbccbb486f27abda58a9ed1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-12 07:14:49 +00:00
Leena Miettinen
4b42f05439 Doc: Update Help mode screenshots to show help in dark mode
Use \image alt text more consistently.

Task-number: QTCREATORBUG-27876
Change-Id: Icc655eb5d05cfdcb16f9eedc836de710ee1ad59d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-11 11:58:36 +00:00
Leena Miettinen
0e2409b0d6 Doc: Describe image viewer Set as Default option
Task-number: QTCREATORBUG-27876
Change-Id: Ibe2b7f39c23b60df13debab7de21d7e999f51448
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-11 11:00:30 +00:00
Tasuku Suzuki
52672b5f6c SessionDialog: rename Switch To to Open and reorder buttons
To be consistent with the SessionNameInputDialog that has the button
"... and Open" to switch to a session.
Buttons should be ordered by like a typical file menu
- new
- open(ex- switch to)
- save(rename/clone)
- close(delete)

Change-Id: I875446352100500eaae4b0ecef4faa6442aef539
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-11 10:53:29 +00:00
Leena Miettinen
0c2a86b63f Doc: Describe new preferences for refactoring actions
Task-number: QTCREATORBUG-27876
Change-Id: I37513cc641db034eaf1737eee4f25c5ba6b7fd82
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-10 15:41:27 +00:00
Eike Ziller
4bbbee1e63 Merge remote-tracking branch 'origin/8.0' into 9.0
Change-Id: Ib2e350805a3043f7b84da960978f09674dc70694
2022-10-10 11:35:05 +02:00
Leena Miettinen
b1af1502a0 Doc: Describe following symbol under cursor for QRC files
Task-number: QTCREATORBUG-27876
Change-Id: If4fa6235fe450617753e5f4a753ca491a92a0613
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-07 13:13:28 +00:00
Mats Honkamaa
bbf55a881a Doc: Mention that Translations is part of enterprise license
Task-number: QDS-7872
Change-Id: Iff54117d0729411805e2e0f468a2195c5e834cbf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-07 07:55:08 +00:00
Pranta Dastider
75e5f60848 QmlDesigner: Qt Bridge documentation fix
Here the documentation mentioning reverse importing assets from
Qt Design Studio to external UI design tools were removed to
make the information relevant and less misleading considering
the current state.

Fixes: QDS-7708
Change-Id: Ifc484af4c95b82f01ca9f74cc7dba529bd7eaa61
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-06 14:20:15 +00:00
Pranta Dastider
c68a42925e QmlDesigner: Add new comment to document
Here the document is exclusive for the Enterprise Version of Qt Design
Studio. So, I have added a comment at the top, to keep it clear for
the users of other Qt Design Studio version.

Task-number: QDS-7814
Change-Id: I2fdf56ce6bb46e4b0103631747cc57c9d722a603
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-06 09:40:22 +00:00
Leena Miettinen
49378ced3c Doc: Describe Squish plugin
Fixes: QTCREATORBUG-27890
Change-Id: Icc203a96f08c785f016130480c45c988d26ac371
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-06 07:07:56 +00:00
Leena Miettinen
3667b5ea18 Doc: Describe Text Editor > Font & Folors > Line spacing
Update screenshot.

Task-number: QTCREATORBUG-27876
Change-Id: If5eef7243e94492551480f790286d0538d552cd7
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-05 11:59:58 +00:00
Leena Miettinen
9accbdac02 Doc: Update info about Clang and clangd preferences
And the Show Preprocessed Source action in the code editor
context menu.

Task-number: QTCREATORBUG-27876
Change-Id: I43ca26d6ee7bb5e0441a37aeb1f7eecbb4ba8fde
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-05 11:22:47 +00:00
Leena Miettinen
94ab264d45 Doc: Describe create cursors at the ends of selected lines
...by pressing Alt+Shift+I

Task-number: QTCREATORBUG-27876
Change-Id: Ibdf25f97ec4c705b62e0c0f78239c9004cc45fce
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-05 10:06:52 +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
Leena Miettinen
eeb1cd22ce Doc: Describe new Text Editor > Display preferences
- Visualize Indent check box
- Tint whole margin check box
- Update the screenshot.

Task-number: QTCREATORBUG-27876
Change-Id: Ie61cf82e35f8dda75e0aeea08eda92993ff36a71
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-04 07:32:59 +00:00
Mats Honkamaa
599c882057 Doc: Update custom property documentation
Task-number: QDS-7735
Change-Id: I1f4551e6d5f1319c73bc6e1b05c3c0390feecda9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-04 06:38:10 +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
Leena Miettinen
bea4dd861d Doc: Describe new locator options
- Open as Centered Popup
- Triggering all kinds of actions with the "t" filter

Task-number: QTCREATORBUG-27876
Change-Id: I6aebe62726fae9ba68d4f841cce6ee4cf7434747
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-30 12:46:36 +00:00
Leena Miettinen
65d6c663e3 Doc: Describe the Help > Change Log option
Task-number: QTCREATORBUG-27876
Change-Id: I484070f77695652642c6b2a12a57b2d0ec691708
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-30 07:14:43 +00:00