diff options
-rw-r--r-- | doc/src/introtodbus.qdoc | 2 | ||||
-rw-r--r-- | src/gui/kernel/qwidget.cpp | 2 | ||||
-rw-r--r-- | src/gui/math3d/qgenericmatrix.cpp | 2 | ||||
-rw-r--r-- | src/gui/styles/qproxystyle.cpp | 13 | ||||
-rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 9 | ||||
-rw-r--r-- | src/sql/kernel/qsqldriver.cpp | 9 |
6 files changed, 19 insertions, 18 deletions
diff --git a/doc/src/introtodbus.qdoc b/doc/src/introtodbus.qdoc index 1edc6eb..1cd874c 100644 --- a/doc/src/introtodbus.qdoc +++ b/doc/src/introtodbus.qdoc @@ -207,7 +207,7 @@ This feature can be enabled on a per-application basis by setting the \c QDBUS_DEBUG environment variable before running each application. For example, we can enable debugging only for the car in the - \l{Remote Controlled Car Example} by running the controller and the + \l{D-Bus Remote Controlled Car Example} by running the controller and the car in the following way: \snippet doc/src/snippets/code/doc_src_introtodbus.qdoc QDBUS_DEBUG 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() */ diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 990ad9a..870aff8 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -1481,17 +1481,16 @@ QString QSqlDatabase::connectionName() const } /*! - - Sets the default numerical precision policy that queries use when created - on this database connection. + Sets the default numerical precision policy used by queries created + on this database connection to \a precisionPolicy. Note: Drivers that don't support fetching numerical values with low precision will ignore the precision policy. You can use QSqlDriver::hasFeature() to find out whether a driver supports this feature. - Note: Setting the default precision policy doesn't affect any currently - active queries. + Note: Setting the default precision policy to \a precisionPolicy + doesn't affect any currently active queries. \sa QSql::NumericalPrecisionPolicy, numericalPrecisionPolicy(), QSqlQuery::setNumericalPrecisionPolicy(), QSqlQuery::numericalPrecisionPolicy() */ diff --git a/src/sql/kernel/qsqldriver.cpp b/src/sql/kernel/qsqldriver.cpp index f7492c3..48ef6a2 100644 --- a/src/sql/kernel/qsqldriver.cpp +++ b/src/sql/kernel/qsqldriver.cpp @@ -914,12 +914,11 @@ QString QSqlDriver::stripDelimitersImplementation(const QString &identifier, Ide } /*! + Sets the default numerical precision policy used by queries created + by this driver to \a precisionPolicy. - Sets the default numerical precision policy that queries use when created - by this driver. - - Note: Setting the default precision policy doesn't affect any currently - active queries. + Note: Setting the default precision policy to \a precisionPolicy + doesn't affect any currently active queries. \sa QSql::NumericalPrecisionPolicy, numericalPrecisionPolicy(), QSqlQuery::setNumericalPrecisionPolicy(), QSqlQuery::numericalPrecisionPolicy() */ |