Commit Graph

638 Commits

Author SHA1 Message Date
Tim Jenssen
3c6fdcbba8 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: If6812125747b4e090063536215f0d6b79dde27e4
2024-10-22 12:50:25 +02:00
Mats Honkamaa
867343465d Doc: Add links to overview pages
Add links to existing overview pages in the left side bar

Task-number: QDS-13385
Change-Id: I1ae626532219d96f9b29ddaa8022a8fc1935a279
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2024-10-16 10:16:00 +00:00
Pranta Dastider
d7edd5c757 QmlDesigner: Update contextual help doc with Git information
The contextual help was missing Git requirement information to be able to use the CMake Generation option in Design Studio. This patch fixes the issue by including the information.

Change-Id: I094d6a411df96d9995578cc0dbdd26a5e84f2d6e
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-10-14 14:52:33 +00:00
Johanna Vanhatapio
cf27c5d71b Doc: Remove app flow docs
Task-number: QDS-13232
Change-Id: I452b418fc4b59fab28f6d2284776ad8274d5ad96
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-10-14 12:55:43 +00:00
Johanna Vanhatapio
7df954c52b Doc: Remove Model Editor docs
Task-number: QDS-13221
Change-Id: I4b24e5344c71e0eebe48c9deb5a3c5214cd77f01
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
2024-10-10 12:07:22 +00:00
Eike Ziller
58ec844407 Merge remote-tracking branch 'origin/14.0'
Conflicts:
	doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
	doc/qtdesignstudio/src/qtdesignstudio.qdoc

Change-Id: I5ed7426b5d19e973dc07ed0717807c37180d611e
2024-10-01 09:33:15 +02:00
Leena Miettinen
bba179912b Doc: Add info about Qt Creator licenses
Fixes: QTCREATORBUG-31653
Change-Id: Ib203d428940eceb8bbbdecda731d077dc8163492
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2024-09-30 14:30:28 +00:00
Mats Honkamaa
3886205424 Doc: Add link to 4.6 release blog post
Change-Id: I9c51b1147545884563b8ffae06080fc845d93492
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Teea Põldsam <teea.poldsam@qt.io>
2024-09-26 05:50:37 +00:00
Mats Honkamaa
d93dd5678b Doc: Update left-side menu
Task-number: QDS-13381
Change-Id: I7c4eb1111ab398a29a2c891e905ddcad7fd9f5a4
Reviewed-by: Teea Põldsam <teea.poldsam@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2024-09-26 05:50:03 +00:00
Tim Jenssen
1e53f104d4 Merge remote-tracking branch 'origin/qds/dev'
add QWidget include in src/plugins/qmldesigner/libs/designercore/model/model.cpp

prepare src/plugins/lua/CMakeLists.txt if lua plugin is not built

Necessary change in:
src/plugins/qmldesigner/components/toolbar/messagemodel.h

Because Utils::Id is a friend of qHash now, QtCreator API
removed uniqueIdentifier().

std::unordered_map<quintptr, ProjectExplorer::TaskCategory>
->
QHash<Utils::Id, ProjectExplorer::TaskCategory> m_categories = {};

other resolved Conflicts were in:
	cmake/QtCreatorAPI.cmake
	cmake/QtCreatorAPIInternal.cmake
	share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DirectoryFontLoader.qml.tpl
	share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
	src/plugins/effectcomposer/effectcomposerview.cpp
	src/plugins/effectcomposer/effectcomposerwidget.cpp
	src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp
	src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
	src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/designmodecontext.cpp
	src/plugins/qmldesigner/designmodewidget.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp
	src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp
	src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
	src/plugins/studiowelcome/examplecheckout.h

Change-Id: Ia6c204460baf4de886e45666d859ca048d578bcb
2024-09-25 15:20:01 +02:00
Johanna Vanhatapio
4323f41adb Doc: Fix a grammar issue
Change-Id: I33149176ffd944e80a88acb2579ebb6c48c00a1a
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-09-25 12:45:52 +00:00
Teea Poldsam
b37b6b4335 Doc: Hide SDK Tool docs
Change-Id: I8b709c7984ebe26ac38b805756e1354239d1bfc6
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-09-25 12:08:00 +00:00
Mats Honkamaa
1917842ba1 Doc: Fix course links
Task-number: QDS-13732
Change-Id: I6e594838376ab7d86275452357d7749aa37b4cf1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
2024-09-25 10:15:27 +00:00
Pranta Dastider
49d1c12277 QmlDesigner: Update the document for Qt Design Studio and Python workflow
You can now export the design made with Qt Design Studio for Python.
This update tries to explain how that works. It also fixes some
older text.

Fixes: QDS-13486
Change-Id: Ibfc533ab0a319c209f60f3569ad31788de8eae69
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-09-24 14:13:51 +00:00
Pranta Dastider
dffad8e859 QmlDesigner: Update the Qt runtime versions document
Qt Design Studio uses a specific Qt Runtime version to
run the projects. This update include the Qt runtime
versions used for QDS 4.6 releases in the document.

Fixes: QDS-12880
Change-Id: I61d3591ec5e101af6757c61af15f8a14bee8a2ee
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-09-17 10:11:31 +00:00
Mats Honkamaa
795949f2da Doc: Fix qdocconf file
Replace "Manual" with "Documentation"

Change-Id: Icbb434e83a6158b19688c9affb4f6947222ba3a5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2024-09-11 10:00:20 +00:00
Mats Honkamaa
000bb9c012 Doc: Update landing page
Task-number: QDS-13383
Change-Id: Ie1172360f9fa7338b18c2d470fc5ddfbc6329b22
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Teea Põldsam <teea.poldsam@qt.io>
2024-09-11 09:44:18 +00:00
Teea Poldsam
7d7e3807c2 Doc: Document the effect composer example
Task-number: QDS-13028
Change-Id: Ib6c34a6ffe9c815e89ca030b2020983fa15791bd
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-09-10 11:37:18 +00:00
Mats Honkamaa
f594fe63ec Doc: Document ways to open effect composer effects
Task-number: QDS-13464
Change-Id: I55311741eca71c66af801a87e570b66879fc8b25
Reviewed-by: Teea Põldsam <teea.poldsam@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-09-04 04:58:55 +00:00
Mats Honkamaa
1712e86e66 Doc: Document camera view
Task-number: QDS-13467
Change-Id: I4a4832649da0db31cf444eb01f2bc8a2323346ca
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Teea Põldsam <teea.poldsam@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-08-28 12:47:04 +00:00
Eike Ziller
4d376bf35d Merge remote-tracking branch 'origin/14.0'
Conflicts:
	src/libs/utils/hostosinfo.cpp
	src/plugins/android/androidrunnerworker.cpp
	src/plugins/android/androidrunnerworker.h

Change-Id: I9c8fd1fe176019ef12b6adf5adf3af1b8007a083
2024-08-27 08:39:37 +02:00
Mats Honkamaa
a69f9786d7 Doc: Document importing and exporting bundles
Task-number: QDS-13318
Change-Id: If3ca685e5342de3751e9d8dbb4d22a5c4c93a846
Reviewed-by: Teea Põldsam <teea.poldsam@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-08-26 09:58:23 +00:00
Leena Miettinen
cd198388b7 Doc: Hide SDK Tool docs from QDS Manual
Change-Id: I36160ed1e1d7c360df97dcce20020933848d4d8f
Reviewed-by: Teea Põldsam <teea.poldsam@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-08-26 08:55:05 +00:00
Mats Honkamaa
87d60e6bc3 Doc: Add panning shortcut key
Change-Id: I00e1e013c3cd14bbc76c4167a541388cd07e4e33
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Teea Põldsam <teea.poldsam@qt.io>
2024-08-21 06:50:16 +00:00
Mats Honkamaa
6d5c01f6d3 Doc: Document managing user assets
Task-number: QDS-13317
Change-Id: Iee17876f689119638d9ae999d9afdc3bc325c100
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-08-14 09:48:06 +00:00
Mats Honkamaa
6d634d0575 Doc: Remove unexpected endif
Change-Id: I8c6b9e78cb8fe0d4da7338e0575bfdecb3a51ace
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Teea Põldsam <teea.poldsam@qt.io>
2024-08-09 09:45:36 +00:00
Pranta Dastider
0a54933c8d QmlDesigner: Create a document for the Design Effect Demo Example
This patch creates a document for the Design Effect Demo Example
in Qt Design Studio. It updates a macro, include images and creates text to
support the usage of this demo.

Fixes: QDS-13034
Change-Id: Ifc3634d388d8e27c64ecd2b244669d60757ad33c
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2024-08-05 09:55:52 +00:00
Tim Jenssen
e5d8d1cef0 Merge remote-tracking branch 'origin/14.0' into qds/dev
Change-Id: I1c354102209ba0c3505e3e2745e64ce77cc22bb3
2024-07-23 15:28:59 +02:00
Vikas Pachdha
e1154a5eaf Docs: Document variables export in Figma
Fixes: QDS-11863
Change-Id: I44426f677a04691ed1a850af1efbfac0a6c2ae29
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-23 10:44:32 +00:00
Leena Miettinen
7d137e56b3 Doc: Fix help topics for QDS
- Hide \sa {Read Documentation}{How To: Read Documentation} to
  fix QDoc warnings
- List the other help topics in "Get help" (they were only accessible
  from All Topics)
- Add an image that shows the QDS Code view instead of
  Qt Creator Edit mode

Change-Id: I85b570b8db8953e5e676e1518fdb03f4e8bfded4
Reviewed-by: Teea Põldsam <teea.poldsam@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-07-17 09:52:02 +00:00
Tim Jenßen
93588dbee2 Merge remote-tracking branch 'origin/14.0' into qds/dev
Conflicts:
	doc/qtdesignstudio/src/how-to/qtdesignstudio-live-preview-desktop.qdoc
	qt_attributions.json
	src/libs/sqlite/CMakeLists.txt
	src/plugins/qmldesigner/CMakeLists.txt
	src/plugins/qmldesignerbase/QmlDesignerBase.json.in
	src/plugins/qmlprojectmanager/CMakeLists.txt
	src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.cpp
	src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.h

Change-Id: If33e41d8951a49acaba0a74c3e5848eef52bb945
2024-07-10 18:11:28 +02:00
Pranta Dastider
d01a843369 QmlDesigner: Update the project structure information
This patch updates the information related to the project structure
of Qt Design Studio. It also adds new images to display
a real project scenario.

Fixes: QDS-12522
Change-Id: I5c9151be676d21fe581debdfabfd601acb92ca6e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-07-03 14:18:45 +00:00
Mats Honkamaa
d740f0e69e Doc: Add What's new section
Add a "Whats new" section to docs. Link in side bar.

Task-number: QDS-13115
Change-Id: Ifc4d4d7ed576dc8c1ba6f891ffe6714172f8568c
Reviewed-by: Teea Põldsam <teea.poldsam@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2024-07-01 07:06:25 +00:00
Teea Poldsam
0d35eaced7 Doc: Document the 3D asset importer improvements
Added information about the new features and reorganized a bit.

Fixes: QDS-12818
Change-Id: I53049eb5959d1af36e83ef6f2ab8ebe2acff876a
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-06-17 08:29:11 +00:00
Teea Poldsam
534bff5bfd Doc: Add look-at gizmo to 3D doc
Fixes: QDS-13010
Change-Id: I5c518a4d673bc00bd264ad1d472911036928685d
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-06-14 10:12:13 +00:00
Mats Honkamaa
cc942e85a1 Doc: Remove TP note
Change-Id: I29bf1360245db58e76857f74baef8561ae42cf49
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2024-06-13 08:31:45 +00:00
Teea Poldsam
1f0828af4f Doc: Create a landing page for Effects
Listed all effects and their descriptions to a Effects landing page

Fixes: QDS-12890
Change-Id: I18e3df5a11d9aa4e9abfcbd0c23743b839cb7807
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-06-12 09:12:14 +00:00
Teea Poldsam
048df016ab Doc: Add links related to previewing the design
Fixes: QTBUG-125475
Change-Id: Id40bfff892d0b27d361d8e66317242c10592140b
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-06-06 11:38:35 +00:00
Pranta Dastider
71c47350d0 QmlDesigner: Update the Layouts doc
This patch updates the Layout document. Removing old tables
as they are now mostly in tooltips. Also, it tries to
structure the instructions and slightly fix the wording.
It adds an example for Qt Quick Layout workflow and explains
how properties should be used to adjust the components
in the Layout.

Fixes: QDS-12282
Change-Id: I10ec4d8f527c605632843b23007c54c87b22fd86
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-05-30 13:01:29 +00:00
Teea Poldsam
d3a0a497b0 Doc: Add info about the default lighting in non-View3D scenes
Fixes: QDS-12817
Change-Id: I3965a4ec635e96810e5408095e2b700a8e7e0ce0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2024-05-30 08:35:13 +00:00
Pranta Dastider
e8a44781f0 QmlDesigner: Update Qt UI Viewer doc with license information
Previous the Qt UI Viewer doc did not have the information
that it requires enterprise license. The patch updates this
information.

Fixes: QDS-12849
Change-Id: I9a6eac24aacb68f74eefa0ccc77cce2fd388190e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-05-29 11:43:56 +00:00
Tim Jenssen
4515fba526 Merge remote-tracking branch 'origin/qds/dev'
Conflicts: src/plugins/qmldesigner/CMakeLists.txt

Change-Id: I250c8e5284ddb0f335c440999b8920762419c89b
2024-05-28 19:06:18 +02:00
Teea Poldsam
7724da3027 Doc: Add topics to Best Practices section
Fixes: QDS-12756
Change-Id: I34db98abb6c1b30e0df94440711ff1979552a25d
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-05-27 06:41:38 +00:00
Teea Poldsam
d2e4a980bf Doc: Document fly mode speed shortcuts
Fixes: QDS-12664
Change-Id: I4cf001ec3f98c364323b1389e024df5f06055c59
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2024-05-24 06:44:03 +00:00
Pranta Dastider
5f23a07ba7 QmlDesigner: Update Qt Academy course links in documents
This patch adds some of the Qt Academy course links in
the relevant documents.

Fixes: QDS-12747
Change-Id: I8309681869922be3277e775c312ffa1210d64a29
Reviewed-by: Jaishree Vyas <jaishree.vyas@qt.io>
2024-05-23 08:46:38 +00:00
Mats Honkamaa
1c216f0a38 Doc: Add glow best practices docs
Task-number: QDS-11695
Change-Id: Icf57fe5d94194e5be3d741a19f9f3dea51114048
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2024-05-23 08:38:42 +00:00
Teea Poldsam
93861d6d56 Doc: Reorganize the sidebar
Fixes: QDS-12809
Change-Id: Ic28b94db2752992c4b08fe0c6ac15a159399a486
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-05-23 05:54:46 +00:00
Mats Honkamaa
d9f4987d71 Doc: Add link to Design Effects
Change-Id: Ia62f86bc586a6ccb5b60b95fdfef97068decb408
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2024-05-22 07:51:42 +00:00
Pranta Dastider
6cf945af59 QmlDesigner: Update Qt Design Studio to Qt Creator workflow doc
This patch updates the Qt Design Studio to Qt Creator workflow.
Adding the new way to generate CMake and then importing it in
Qt Creator.

Fixes: QDS-10787
Change-Id: I31c54c92ddca8872977ac066d06d7877e3770671
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-05-21 10:20:10 +00:00
Johanna Vanhatapio
46350083de Doc: Improve the documentation for 3D
Some editions to comply with the MS Style guide and to
improve the structure.

Task-number: QDS-12670
Change-Id: Iddb0778327880ec65bdb590d1e02e4ca15e72051
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-05-21 05:45:21 +00:00