diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-12 12:52:22 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-12 12:52:22 +0200 |
| commit | 2371147354d4436bb54c588662ac315dd4c2f940 (patch) | |
| tree | 5c90b1dd18de394cff2fb4e1bedc628da3c7d341 /doc/src/tutorials | |
| parent | 54ec6d177e0e8fb04cd01e70461484a80ca1f7a4 (diff) | |
| parent | 82454b6014a7ee0b048b4db8d64a21de849d4ab9 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/gui/image/qicon.cpp
src/gui/image/qicon.h
src/gui/image/qicon_p.h
src/gui/text/qfontdatabase.cpp
src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
sync.profile
Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
Diffstat (limited to 'doc/src/tutorials')
| -rw-r--r-- | doc/src/tutorials/modelview.qdoc | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/doc/src/tutorials/modelview.qdoc b/doc/src/tutorials/modelview.qdoc index 35454f4268..9cbba47b60 100644 --- a/doc/src/tutorials/modelview.qdoc +++ b/doc/src/tutorials/modelview.qdoc @@ -777,7 +777,7 @@ \section2 4.2 Qt Documentation - Qt 4.7 comes with 17 examples and 2 Demonstrations for model/view. + Qt 5.0 comes with 19 examples for model/view. The examples can be found on the \l{Item Views Examples} page. \table @@ -842,6 +842,11 @@ \o QStandardItemModel \o \row + \o Interview + \o Multiple + \o Custom item model + \o Multiple views + \row \o Pixelator \o QTableView \o Custom table model @@ -872,23 +877,15 @@ \o QStandardItemModel \o Custom delegate that uses a spin box as a cell editor \row + \o Spreadsheet + \o {2, 1} QTableView + \o Custom delegates + \row \o Star Delegate \o {2, 1} QTableWidget \o Comprehensive custom delegate example. \endtable - \l{Qt Demonstrations}{Demonstrations} are similar to examples except that no - walkthrough is provided for the code. Demonstrations are typically more - feature rich than examples. - - \list - \o The \bold Interview demonstration shows the same model and - selection being shared between three different views. - \o The \bold Spreadsheet demonstration illustrates the use of a - table view as a spreadsheet, using custom delegates to render - each item according to the type of data it contains. - \endlist - A \l{Model/View Programming}{reference document} for model/view technology is also available. */ |