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/kernel/qwidget.cpp | |
| 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/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index ebc9dd5..80d7b85 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -612,7 +612,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 |