summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-06-16 08:34:54 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-06-16 08:36:05 (GMT)
commit6e8568ff784e093460e4383e32e064a49165c3a8 (patch)
treee0c7888e6ce2ddc2b0fe6840cedddd402aecff8d /src/gui
parentea83669b9b44b1fb3a5acae6d53afd1df401e9b5 (diff)
downloadQt-6e8568ff784e093460e4383e32e064a49165c3a8.zip
Qt-6e8568ff784e093460e4383e32e064a49165c3a8.tar.gz
Qt-6e8568ff784e093460e4383e32e064a49165c3a8.tar.bz2
doc: Fixed several qdoc errors.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qwidget.cpp2
-rw-r--r--src/gui/math3d/qgenericmatrix.cpp2
-rw-r--r--src/gui/styles/qproxystyle.cpp13
3 files changed, 10 insertions, 7 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index db73c07..eed873a 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -5635,7 +5635,7 @@ bool QWidget::hasFocus() const
called from focusOutEvent() or focusInEvent(), you may get an
infinite recursion.
- \sa focus(), hasFocus(), clearFocus(), focusInEvent(), focusOutEvent(),
+ \sa hasFocus(), clearFocus(), focusInEvent(), focusOutEvent(),
setFocusPolicy(), focusWidget(), QApplication::focusWidget(), grabKeyboard(),
grabMouse(), {Keyboard Focus}
*/
diff --git a/src/gui/math3d/qgenericmatrix.cpp b/src/gui/math3d/qgenericmatrix.cpp
index 747b012..82be256 100644
--- a/src/gui/math3d/qgenericmatrix.cpp
+++ b/src/gui/math3d/qgenericmatrix.cpp
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
But they can be different if the user wants to store elements
internally in a fixed-point format for the underlying hardware.
- \sa QMatrix4x4, QFixedPoint
+ \sa QMatrix4x4
*/
/*!
diff --git a/src/gui/styles/qproxystyle.cpp b/src/gui/styles/qproxystyle.cpp
index 853dcd1..0e19359 100644
--- a/src/gui/styles/qproxystyle.cpp
+++ b/src/gui/styles/qproxystyle.cpp
@@ -372,11 +372,14 @@ bool QProxyStyle::event(QEvent *e)
Returns an icon for the given \a standardIcon.
Reimplement this slot to provide your own icons in a QStyle
- subclass; because of binary compatibility constraints, the
- standardIcon() function (introduced in Qt 4.1) is not
- virtual. Instead, standardIcon() will dynamically detect and call \e
- this slot. The default implementation simply calls the
- standardPixmap() function with the given parameters.
+ subclass. The \a option argument can be used to pass extra
+ information required to find the appropriate icon. The \a widget
+ argument is optional and can also be used to help find the icon.
+
+ \note Because of binary compatibility constraints, standardIcon()
+ introduced in Qt 4.1 is not virtual. Therefore it must dynamically
+ detect and call \e this slot. This default implementation simply
+ calls standardIcon() with the given parameters.
\sa standardIcon()
*/