diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-02 19:40:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-02 19:40:01 (GMT) |
| commit | 78df9e39a43b21f7f0fedca11f906a2ae9df99c1 (patch) | |
| tree | 7555c67167c8ae23243056066ac39b3a9a0f42d7 /src/gui | |
| parent | 5d22c768c4066ebec59193bc3ab3af18cc461534 (diff) | |
| parent | 6d5963486c8c2a154caf3a2a391bce19cbbeb881 (diff) | |
| download | Qt-78df9e39a43b21f7f0fedca11f906a2ae9df99c1.zip Qt-78df9e39a43b21f7f0fedca11f906a2ae9df99c1.tar.gz Qt-78df9e39a43b21f7f0fedca11f906a2ae9df99c1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fixing potential js hole in the js function for the feedback channel.
qdoc: Completed task QTBUG-18790
qdoc: Completed task QTBUG-18733
qdoc: Last commit before merge into master.
Doc: Fixed reference to a name in a table.
qdoc: Fixed license comment.
Ensured that incomplete downloads are removed.
qdoc: Added missing copyright notice
qdoc: Updated the QDoc manual.
qdoc: Updated the QDoc manual.
qdoc: Updated the QDoc manual.
qdoc: Updated the QDoc manual.
qdoc: Fixed QTBUG-18591
Aim to fix Windows builds.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/itemviews/qdatawidgetmapper.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 2 |
2 files changed, 2 insertions, 2 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. diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index ac35d42..9d9cd75 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -598,7 +598,7 @@ void QWidget::setAutoFillBackground(bool enabled) \brief The QWidget class is the base class of all user interface objects. \ingroup basicwidgets - + The widget is the atom of the user interface: it receives mouse, keyboard and other events from the window system, and paints a representation of itself on the screen. Every widget is rectangular, and they are sorted in a |