Commit Graph

485 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Eike Ziller
4bbbee1e63 Merge remote-tracking branch 'origin/8.0' into 9.0
Change-Id: Ib2e350805a3043f7b84da960978f09674dc70694
2022-10-10 11:35:05 +02: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
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
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
Mats Honkamaa
67112a581f Doc: Fix branding issue
\QC rendered as Qt Design Studio in places where it should be Qt Creator.

Task-number: QDS-7712
Change-Id: I16df93bbb7881c280e96aede32f5619d1228b8f5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-09-27 11:51:56 +00:00
Eike Ziller
7eaa36e6e5 Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/designercore/imagecache/meshimagecachecollector.cpp

Change-Id: I38f196e8f42cf11f7b613e7a723745600e35c5e9
2022-09-27 10:03:37 +02:00
Leena Miettinen
9542e9bd1c Doc: Fix missing \endlist command
Change-Id: I4daee6fad7d016c60b359c881852549c4d751528
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-09-26 07:04:16 +00:00
Mats Honkamaa
be34449247 Doc: Add info about 3D view context menu
Task-number: QDS-7494
Change-Id: Ic6fce90317e2ff5736ba20996ba30b1f338c36ac
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-09-22 10:47:44 +00:00
Eike Ziller
5d55cfdae5 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
	src/libs/utils/fileutils.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/nodemetainfo.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/qmldesigner/designercore/model/model_p.h
	src/plugins/remotelinux/linuxdevice.cpp
	tests/auto/utils/fileutils/tst_fileutils.cpp

Change-Id: I26a21e2523d3d725fdb8c548a531cdbdaeaeca20
2022-09-19 09:54:06 +02:00
Mats Honkamaa
710be65822 Doc: Update material editor and browser docs
Added info about dragging and dropping materials to objects and
copying and pasting material properties.

Task-number: QDS-7408
Change-Id: I5d051a7df2a1b021db07ca36bf4d6f356e7ea6a2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-09-16 06:33:13 +00:00
Eike Ziller
5ae23f8c66 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	.github/workflows/build_cmake.yml
	src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp
	src/plugins/qmldesigner/components/materialeditor/materialeditorview.h
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
	src/plugins/qmldesigner/designercore/model/model.cpp

Change-Id: I111b9140375b894a5487cc012b17cc32100bdb8d
2022-09-13 11:15:16 +02:00
Mats Honkamaa
e9bea54139 Doc: Add info about 3D view background color actions
Document the new options in the toolbar.

Task-number: QDS-7498
Change-Id: I7a6ec6d0a56453240e51fd4149ecc2712e7980b6
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-09-09 12:20:04 +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
Eike Ziller
64247bf571 Merge remote-tracking branch 'origin/8.0'
Reverts/comments out parts of 45f93a817a,
which needs to be resolved in a follow-up commit.

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
	src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
	src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
	src/plugins/python/pythoneditor.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
	src/plugins/scxmleditor/common/colorsettings.cpp

Change-Id: I7f0f7b7120e75a9fc3a8886bc57c17345cbb501b
2022-08-19 12:48:27 +02:00
Mats Honkamaa
814115256c Doc: Update info on how to get Bridges
Qt Bridges are nowadays avaialble in the QDS enterprise license.

Task-number: QDS-7356
Change-Id: Iec78d8879698462292626c413bfc0810e68c40b7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-08-19 05:22:33 +00:00
Eike Ziller
278f33d521 Merge remote-tracking branch 'origin/8.0'
Change-Id: I71c50e425202d4cec945a8464605630b5af9a0df
2022-07-29 15:07:18 +02:00
Vikas Pachdha
2356e9314c Docs: Update Qt-Bridge Sketch docs for version 3.6
Fixes: QDS-7342
Change-Id: I8bae5b367e0d1b7c26e369f2169469f564eea3c2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-07-29 09:25:58 +00:00
Eike Ziller
9328aaa835 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1ed3dd86fe5b4b87e3015c41652f5d0fa16d7070
2022-07-25 09:25:00 +02:00
Mats Honkamaa
87212ba639 Doc: Update Loader3D documentation
Task-number: QDS-6972
Change-Id: I61259f4baef7f7607ab7d1dd9c8124e5ae3274c4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-07-22 07:42:17 +00:00
Eike Ziller
90a03391d7 Merge remote-tracking branch 'origin/8.0'
Change-Id: I37a1f78caf9ae258c6b052efa3be15b3dbcbe164
2022-07-12 13:56:23 +02: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
Leena Miettinen
89be4d7d17 Doc: Replace "options" with "preferences"
...when referring to Preferences dialog.

Task-number: QTCREATORBUG-27560
Change-Id: I2f41420b0ec5955d84ad715d239209adddff0529
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-12 07:30:49 +00:00
Leena Miettinen
57329c7cf9 Doc: Exclude docker folder from QDS doc builds
Task-number: QTCREATORBUG-27561
Change-Id: I3320579259bd5d15c407830176ac4be6d7f62942
Reviewed-by: hjk <hjk@qt.io>
2022-07-12 06:43:00 +00:00
hjk
14216fdf73 QDS: Doc fixes
Change-Id: I67f3c8477ace46c55499c73bf3a7eb1779c9f964
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-07-08 07:37:23 +00:00
Tim Jenssen
56bcad81ad Merge remote-tracking branch 'origin/7.0' into 8.0
Change-Id: I7cd5d3808007ef739212f4347ba9b16e7b298943
2022-07-01 09:22:10 +00:00
Mats Honkamaa
ee40ed19e5 Doc: Update timeline documentation
- Added a task topic for binding a timeline to a property.
- Added topic on adding multilpe timelines.
- Some changes to focus more on the task rather than function.
- Other minor updates.

Task-number: QDS-6879
Change-Id: Ibd99785d6a9ee70fc10b8e1395ef8aaf0e186ddc
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-06-28 13:03:19 +00:00
Leena Miettinen
b5066d71b8 Doc: Replace "Tools > Options" with "Edit > Preferences"
The menu was moved and renamed. The Options dialog was
also renamed "Preferences".

Change-Id: I05d187915382b3ce49699d91304cd447c87e2bd6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-28 08:32:44 +00:00