feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/8.0' into 9.0

Browse Source 
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
This commit is contained in:
Tim Jenssen
2022-10-04 15:21:56 +02:00
parent 993fd2a92a 47887da778
commit 964f539e55
91 changed files with 719 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/qtdesignstudio/src/components/qtquick-data-models.qdoc
View File

@@ -139,7 +139,7 @@
When you add a \l{GridView}{Grid View}, \l{ListView}{List View}, or
\l{PathView}{Path View}, the ListModel and the delegate component that
creates an instance for each item in the model are added automatically.
For grid and list views, you can edit the list model in \QC.
For grid and list views, you can edit the list model in \QDS.
\image qtquick-designer-listview-preview.png "Preview of a list view"