diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 09:06:47 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 09:06:47 (GMT) |
| commit | 660ebda77f6cbc4a41f45f78e18dbc892cd1c551 (patch) | |
| tree | 36ecf9860281d337bfda350c597951623838ca9f /src/gui/itemviews | |
| parent | 43482fcfc106864f104f463002575c389d40b12f (diff) | |
| parent | 78df9e39a43b21f7f0fedca11f906a2ae9df99c1 (diff) | |
| download | Qt-660ebda77f6cbc4a41f45f78e18dbc892cd1c551.zip Qt-660ebda77f6cbc4a41f45f78e18dbc892cd1c551.tar.gz Qt-660ebda77f6cbc4a41f45f78e18dbc892cd1c551.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/graphicsview/qgraphicslayout_p.cpp
Diffstat (limited to 'src/gui/itemviews')
| -rw-r--r-- | src/gui/itemviews/qdatawidgetmapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/itemviews/qdatawidgetmapper.cpp b/src/gui/itemviews/qdatawidgetmapper.cpp index 745ef5a..dac4613 100644 --- a/src/gui/itemviews/qdatawidgetmapper.cpp +++ b/src/gui/itemviews/qdatawidgetmapper.cpp @@ -291,7 +291,7 @@ void QDataWidgetMapperPrivate::_q_modelDestroyed() \snippet doc/src/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp 0 After the call to toFirst(), \c mySpinBox displays the value \c{1}, \c myLineEdit - displays \c {Nokia Corporation and/or its subsidiary(-ies)} and \c myCountryChooser displays \c{Oslo}. The + displays \c{Qt Norway} and \c myCountryChooser displays \c{Oslo}. The navigational functions toFirst(), toNext(), toPrevious(), toLast() and setCurrentIndex() can be used to navigate in the model and update the widgets with contents from the model. |