diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-13 01:01:04 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-03-13 10:10:09 +0100 |
| commit | 76be4abbbcfb2fbb14ce532413e0895198e7f0f1 (patch) | |
| tree | 5d6ca9c4425df15a93b6f74dc8e4dbb38db74d91 /examples/quick/draganddrop/doc/src/draganddrop.qdoc | |
| parent | 587d789fa5929f462b5744ba33a25db6c77b36fc (diff) | |
| parent | 70d726e91e4ef27002b2271805de19077e25809c (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/qml/compiler/qv4codegen.cpp
src/qml/animations/qsequentialanimationgroupjob.cpp
Change-Id: I8b76e509fd7c8599d4cef25181d790ee28edab54
Diffstat (limited to 'examples/quick/draganddrop/doc/src/draganddrop.qdoc')
| -rw-r--r-- | examples/quick/draganddrop/doc/src/draganddrop.qdoc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/quick/draganddrop/doc/src/draganddrop.qdoc b/examples/quick/draganddrop/doc/src/draganddrop.qdoc index b740582cc4..754fa8f8cb 100644 --- a/examples/quick/draganddrop/doc/src/draganddrop.qdoc +++ b/examples/quick/draganddrop/doc/src/draganddrop.qdoc @@ -57,8 +57,9 @@ \section1 GridView Example - The \e {GridView Example} adds drag and drop to a \l GridView, allowing you to reorder the - list. It also uses a \l DelegateModel to move a delegate item to the + The \e {GridView Example} adds drag and drop to a \l GridView, allowing you + to visually reorder the delegates without changing the underlying + \l ListModel. It uses a \l DelegateModel to move a delegate item to the position of another item it is dragged over. \snippet draganddrop/views/gridview.qml 0 |