summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-09-16 05:31:08 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-09-16 05:31:08 (GMT)
commitafa762f5b266915402e41da34c46d2fc1f6b63fd (patch)
tree90095d525fd52b4451622f889190e4a4ccb018ff
parentc07fa504c092d33965981490b5da37a2e9f2f180 (diff)
parent2fa6d410c6733863b19393c13efbdcb7efd59fc0 (diff)
downloadQt-afa762f5b266915402e41da34c46d2fc1f6b63fd.zip
Qt-afa762f5b266915402e41da34c46d2fc1f6b63fd.tar.gz
Qt-afa762f5b266915402e41da34c46d2fc1f6b63fd.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: minor docu fixes
-rw-r--r--src/gui/graphicsview/qgraphicswidget.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index 965b1b34..b16e51e 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -152,7 +152,7 @@ QT_BEGIN_NAMESPACE
\row \o Qt::WA_SetPalette
\o Set by setPalette().
\row \o Qt::WA_SetFont
- \o Set by setPalette().
+ \o Set by setFont().
\row \o Qt::WA_WindowPropagation
\o Enables propagation to window widgets.
\endtable
@@ -1668,7 +1668,7 @@ void QGraphicsWidget::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
/*!
This event handler, for \a event, can be reimplemented in a subclass to
- receive notifications for Qt::GrabMouse events.
+ receive notifications for QEvent::GrabMouse events.
\sa grabMouse(), grabKeyboard()
*/
@@ -1679,7 +1679,7 @@ void QGraphicsWidget::grabMouseEvent(QEvent *event)
/*!
This event handler, for \a event, can be reimplemented in a subclass to
- receive notifications for Qt::UngrabMouse events.
+ receive notifications for QEvent::UngrabMouse events.
\sa ungrabMouse(), ungrabKeyboard()
*/
@@ -1690,7 +1690,7 @@ void QGraphicsWidget::ungrabMouseEvent(QEvent *event)
/*!
This event handler, for \a event, can be reimplemented in a subclass to
- receive notifications for Qt::GrabKeyboard events.
+ receive notifications for QEvent::GrabKeyboard events.
\sa grabKeyboard(), grabMouse()
*/
@@ -1701,7 +1701,7 @@ void QGraphicsWidget::grabKeyboardEvent(QEvent *event)
/*!
This event handler, for \a event, can be reimplemented in a subclass to
- receive notifications for Qt::UngrabKeyboard events.
+ receive notifications for QEvent::UngrabKeyboard events.
\sa ungrabKeyboard(), ungrabMouse()
*/