diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/animation/qvariantanimation.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/global/qlogging.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index dcbf55f28b..f47dec6ce0 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE There are two ways to affect how QVariantAnimation interpolates the values. You can set an easing curve by calling setEasingCurve(), and configure the duration by calling - setDuration(). You can change how the QVariants are interpolated + setDuration(). You can change how the \l{QVariant}s are interpolated by creating a subclass of QVariantAnimation, and reimplementing the virtual interpolated() function. @@ -110,7 +110,7 @@ QT_BEGIN_NAMESPACE If you need to interpolate other variant types, including custom types, you have to implement interpolation for these yourself. To do this, you can register an interpolator function for a given - type. This function takes 3 parameters: the start value, the end value + type. This function takes 3 parameters: the start value, the end value, and the current progress. Example: @@ -378,8 +378,8 @@ QVariantAnimation::~QVariantAnimation() keyValues are referring to this effective progress. The easing curve is used with the interpolator, the interpolated() - virtual function, the animation's duration, and iterationCount, to - control how the current value changes as the animation progresses. + virtual function, and the animation's duration to control how the + current value changes as the animation progresses. */ QEasingCurve QVariantAnimation::easingCurve() const { diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index 6def794d5e..9fced6ede6 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -1578,7 +1578,7 @@ void qErrnoWarning(int code, const char *msg, ...) The default \a pattern is "%{if-category}%{category}: %{endif}%{message}". The \a pattern can also be changed at runtime by setting the QT_MESSAGE_PATTERN - environment variable; if both qSetMessagePattern() is called and QT_MESSAGE_PATTERN is + environment variable; if both \l qSetMessagePattern() is called and QT_MESSAGE_PATTERN is set, the environment variable takes precedence. Custom message handlers can use qFormatLogMessage() to take \a pattern into account. |