summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-02 19:40:01 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-02 19:40:01 (GMT)
commit78df9e39a43b21f7f0fedca11f906a2ae9df99c1 (patch)
tree7555c67167c8ae23243056066ac39b3a9a0f42d7 /src/gui/kernel/qwidget.cpp
parent5d22c768c4066ebec59193bc3ab3af18cc461534 (diff)
parent6d5963486c8c2a154caf3a2a391bce19cbbeb881 (diff)
downloadQt-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/kernel/qwidget.cpp')
-rw-r--r--src/gui/kernel/qwidget.cpp2
1 files changed, 1 insertions, 1 deletions
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