diff options
| author | Tim Jenssen <[email protected]> | 2023-05-22 19:48:42 +0200 |
|---|---|---|
| committer | Tim Jenssen <[email protected]> | 2023-05-22 21:13:40 +0200 |
| commit | 1b6c0ff56c8d48c5b5bb8044b113cd580f6d5ee3 (patch) | |
| tree | 25878f9091506fd282a338a2c5f98b357d47134e /doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc | |
| parent | 3dcdbe9069c452e2f0eacb925aa7412e63dc4762 (diff) | |
| parent | df7398e2c5f3c1595f32c7484ac1e804d83a01ca (diff) | |
Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
coin/instructions/build.yaml
doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl
src/libs/CMakeLists.txt
src/libs/advanceddockingsystem/dockmanager.cpp
src/libs/advanceddockingsystem/workspacedialog.cpp
src/plugins/coreplugin/manhattanstyle.cpp
src/plugins/qmldesigner/CMakeLists.txt
src/plugins/qmldesigner/components/formeditor/toolbox.cpp
src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp
src/plugins/qmldesignerbase/qmldesignerbaseplugin.h
src/plugins/qmlprojectmanager/qmlproject.cpp
src/tools/qml2puppet/CMakeLists.txt
tests/unit/unittest/CMakeLists.txt
Change-Id: I2c5f18c4fca49471d02713ce5859032232cf7756
Diffstat (limited to 'doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc')
| -rw-r--r-- | doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc index ffb23d35f2e..1aab65187ab 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc @@ -47,10 +47,10 @@ \li Creates a project that uses default and 3D components such as cameras, lights, 3D models, and materials. \row - \li Qt for MCUs + \li \QMCU \li MCU \li Creates an application that uses a subset of default components - (as supported by Qt for MCUs) that you can deploy, run, and debug + (as supported by \QMCU) that you can deploy, run, and debug on MCU boards. \row \li {1,3} Mobile |