Commit Graph

4082 Commits

Author SHA1 Message Date
Eike Ziller
81629e9228 Merge remote-tracking branch 'origin/9.0'
Change-Id: Id7665d5a269ef58cbbb2dbfc1e5b0d1820c4e13e
2022-11-17 16:11:52 +01:00
Tim Jenssen
213d60ad64 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: I74bf2bfb1eacb60675640c47eb41ce51dd6eb99f
2022-11-16 18:22:59 +00:00
Leena Miettinen
be1aa6abed Doc: Fix typos
Change-Id: I22b610a6dcab73867f915f877d7b7b844da5dc22
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
2022-11-16 10:39:24 +00:00
Leena Miettinen
d44a62d588 Doc: Describe "rettype" in "putCallItem" Dumper class
Not all Dumper class members are described, so remove or modify the
leading sentences before lists of members. Add a reference to
dumper.py.

Fixes: QTCREATORBUG-28404
Change-Id: Ib681c44f8ff952d2f2ac0a37a5daf12b4b2486d6
Reviewed-by: hjk <hjk@qt.io>
2022-11-14 10:07:58 +00:00
Leena Miettinen
60bc856a20 Doc: Describe move detection and hiding date in Git Blame view
Task-number: QTCREATORBUG-27876
Change-Id: Ibf93af9dfcd621bf66ddcf84cbae5d5baa963635
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-11-11 09:44:14 +00:00
Leena Miettinen
b59ad8b0a9 Doc: Use active voice instead of passive voice
This fixes issues found by vale.

Change-Id: Ic3495633cc3aabd000e53b4a4107b9bccde28005
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
2022-11-11 09:43:32 +00:00
Tim Jenssen
f8c99ebd9a Merge remote-tracking branch 'origin/9.0' into qds/dev
Change-Id: I02fd6f492c27d85b88af7ec8bc18ff62f2c6ed14
2022-11-09 16:41:12 +01:00
Tim Jenssen
63d3a6bd3d Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
  src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
  src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
  src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: I24216ae3f83cdde3493b4a6274e24a72f75820fc
2022-11-09 11:45:25 +01:00
Pranta Dastider
ac526d326c QmlDesigner: Update qtbridge typo
In the documentation of "Using Qt Bridge for Sketch"
there was a typo regarding qtbridge. This is for fixing
that particular text.

Fixes: QDS-8188
Change-Id: If87f6561656f61a43888e1ddc517020cc576cbf6
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-11-08 16:52:16 +00:00
Pranta Dastider
4d1041169e QmlDesigner: Update Version Number
Update version numbers of software in the
Qt Bridge "Supported Platforms" document.

Change-Id: I143a3c8b207db74c6f6e91dcf7e523d03062e6ea
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-08 15:04:30 +00:00
Pranta Dastider
0228cfef1c QmlDesigner: Update the state group name
Update the state group name from "root" to "default".
Update the photos for that particular sections.

Fixes: QDS-8144
Change-Id: I044172d1555c0402e42d37d6d5bb17a0238ce6ac
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-08 14:35:00 +00:00
Mats Honkamaa
85fde5932a Doc: Add Effect Maker documentation
Task-number: QDS-7669
Change-Id: I49f77d61b018516bd3b460fd92c8fa620ec10d81
Reviewed-by: <amr.elsayed@qt.io>
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-11-08 13:08:37 +00:00
Pranta Dastider
3f2c3324fd QmlDesigner: Update the typo in Adobe illustrator export
Update and change the typo found in Adobe illustrator design
export doc.

Fixes: QDS-8187
Change-Id: I219078aab77799ec5b0eb2287fb0b299fa46351c
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-11-08 11:30:04 +00:00
Pranta Dastider
442a916026 QmlDesigner: Update Adobe XD Information
Update the missing infomration about Adobe XD
supported version for Qt Bridge in the document.

Fixes: QDS-8190
Change-Id: Ic171749eb1f3138d9e1638e9f22be88d9c708373
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-11-08 11:29:28 +00:00
Leena Miettinen
fe376af66b Doc: Update File System view screenshot to show the number
...that is referred to in the text.

Change-Id: If5f343d2b25ecf5cfc4761f2a1326903f8925f36
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-08 09:13:26 +00:00
Leena Miettinen
f57ec09ee8 Doc: Add debugger troubleshooting information
From https://wiki.qt.io/Qt_Creator_Windows_Debugging

Task-number: QTCREATORBUG-27876
Change-Id: I36b19311387a93f729aea1bbc28db125e1d1230c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-11-08 08:32:28 +00:00
Leena Miettinen
65cfbc1b6e Doc: Use "remote Linux" instead of "generic remote Linux"
- Reflect the term changes in the UI.
- Move info about SSH port property to the wizard step list.
- Make the topic names in "Deploying to Devices" shorter.
- Remove some unnecessary "if defined(qtdesignstudio)" conditions
  from topics that are not used in the QDS Manual.

Task-number: QTCREATORBUG-27876
Change-Id: I2282257f245c31af82a41ea0e533407bf1cbd775
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-11-08 08:31:30 +00:00
Eike Ziller
a1851c7cf1 Add -language command line option for overriding UI language
I run Qt Creator in german, but for responding to questions and
generally looking things up I regularly want to run it temporarily in
english. A command line option makes that easier than having to start Qt
Creator, navigate to the settings, and restarting it, and doing the same
again to revert back to german.

Change-Id: I7c0d84375ffc97e5c7607307fd3f785f2c315c3d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-11-07 14:50:36 +00:00
Leena Miettinen
fb5093d140 Doc: Update info on Docker devices
Task-number: QTCREATORBUG-27876
Change-Id: I837ce8b8aeea5d238e98a70b7b5754be46d2e34a
Reviewed-by: hjk <hjk@qt.io>
2022-11-07 14:39:58 +00:00
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