diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-03 12:56:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-03 12:56:19 (GMT) |
| commit | 3b367916c00528012c969b453f68749d8c4fdc7d (patch) | |
| tree | a7eee4a00dff52baceaeb98b44622ca3f66ff5d7 /src/gui/itemviews | |
| parent | 60e65cc23bf1df213320604062ef98e40c46d3df (diff) | |
| parent | 660ebda77f6cbc4a41f45f78e18dbc892cd1c551 (diff) | |
| download | Qt-3b367916c00528012c969b453f68749d8c4fdc7d.zip Qt-3b367916c00528012c969b453f68749d8c4fdc7d.tar.gz Qt-3b367916c00528012c969b453f68749d8c4fdc7d.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (26 commits)
Fixing potential js hole in the js function for the feedback channel.
Fix tst_Q3ProgressBar::setProgress, again
Disable tst_Q3ComboBox::task231724_clear on Mac
Fix tst_Q3ProgressBar::setProgress()
Revert "Fix double painting when adding an item into a linear layout"
Add missing license headers
Revert "Fixed a crash in QListView"
qdoc: Completed task QTBUG-18790
qdoc: Completed task QTBUG-18733
Benchmark for layout hierarchies
Manual test for layout flickering
Improve invalidate() testcase.
Avoid flicker when invalidate is propagated in a widget/layout hierarchy
Do not call setSizePolicy from ctor, it might call a virtual function
qdoc: Last commit before merge into master.
Fixed a crash in QListView
Doc: Fixed reference to a name in a table.
qdoc: Fixed license comment.
Ensured that incomplete downloads are removed.
qdoc: Added missing copyright notice
...
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. |