aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/util')
-rw-r--r--src/quick/util/qquickanimation.cpp282
-rw-r--r--src/quick/util/qquickanimationcontroller.cpp2
-rw-r--r--src/quick/util/qquickconnections.cpp6
-rw-r--r--src/quick/util/qquickfontloader.cpp14
-rw-r--r--src/quick/util/qquickimageprovider.cpp6
-rw-r--r--src/quick/util/qquickpath.cpp56
-rw-r--r--src/quick/util/qquickpixmapcache.cpp4
-rw-r--r--src/quick/util/qquickpropertychanges.cpp11
-rw-r--r--src/quick/util/qquicksmoothedanimation.cpp6
-rw-r--r--src/quick/util/qquicksystempalette.cpp6
-rw-r--r--src/quick/util/qquicktimeline.cpp14
11 files changed, 203 insertions, 204 deletions
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index 51b598b28d..33a5d0a438 100644
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -1536,11 +1536,11 @@ void QQuickRotationAnimation::setTo(qreal t)
Possible values are:
\list
- \o RotationAnimation.Numerical (default) - Rotate by linearly interpolating between the two numbers.
+ \li RotationAnimation.Numerical (default) - Rotate by linearly interpolating between the two numbers.
A rotation from 10 to 350 will rotate 340 degrees clockwise.
- \o RotationAnimation.Clockwise - Rotate clockwise between the two values
- \o RotationAnimation.Counterclockwise - Rotate counterclockwise between the two values
- \o RotationAnimation.Shortest - Rotate in the direction that produces the shortest animation path.
+ \li RotationAnimation.Clockwise - Rotate clockwise between the two values
+ \li RotationAnimation.Counterclockwise - Rotate counterclockwise between the two values
+ \li RotationAnimation.Shortest - Rotate in the direction that produces the shortest animation path.
A rotation from 10 to 350 will rotate 20 degrees counterclockwise.
\endlist
*/
@@ -1846,7 +1846,7 @@ void QQuickBulkValueAnimator::topLevelAnimationLoopChanged()
It can be used to define animations in a number of ways:
\list
- \o In a \l Transition
+ \li In a \l Transition
For example, to animate any objects that have changed their \c x or \c y properties
as a result of a state change, using an \c InOutQuad easing curve:
@@ -1854,21 +1854,21 @@ void QQuickBulkValueAnimator::topLevelAnimationLoopChanged()
\snippet doc/src/snippets/qml/propertyanimation.qml transition
- \o In a \l Behavior
+ \li In a \l Behavior
For example, to animate all changes to a rectangle's \c x property:
\snippet doc/src/snippets/qml/propertyanimation.qml behavior
- \o As a property value source
+ \li As a property value source
For example, to repeatedly animate the rectangle's \c x property:
\snippet doc/src/snippets/qml/propertyanimation.qml propertyvaluesource
- \o In a signal handler
+ \li In a signal handler
For example, to fade out \c theObject when clicked:
\qml
@@ -1878,7 +1878,7 @@ void QQuickBulkValueAnimator::topLevelAnimationLoopChanged()
}
\endqml
- \o Standalone
+ \li Standalone
For example, to animate \c rect's \c width property over 500ms, from its current width to 30:
@@ -2010,175 +2010,175 @@ void QQuickPropertyAnimation::setTo(const QVariant &t)
\table
\row
- \o \c Easing.Linear
- \o Easing curve for a linear (t) function: velocity is constant.
- \o \inlineimage qeasingcurve-linear.png
+ \li \c Easing.Linear
+ \li Easing curve for a linear (t) function: velocity is constant.
+ \li \inlineimage qeasingcurve-linear.png
\row
- \o \c Easing.InQuad
- \o Easing curve for a quadratic (t^2) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-inquad.png
+ \li \c Easing.InQuad
+ \li Easing curve for a quadratic (t^2) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-inquad.png
\row
- \o \c Easing.OutQuad
- \o Easing curve for a quadratic (t^2) function: decelerating to zero velocity.
- \o \inlineimage qeasingcurve-outquad.png
+ \li \c Easing.OutQuad
+ \li Easing curve for a quadratic (t^2) function: decelerating to zero velocity.
+ \li \inlineimage qeasingcurve-outquad.png
\row
- \o \c Easing.InOutQuad
- \o Easing curve for a quadratic (t^2) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutquad.png
+ \li \c Easing.InOutQuad
+ \li Easing curve for a quadratic (t^2) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutquad.png
\row
- \o \c Easing.OutInQuad
- \o Easing curve for a quadratic (t^2) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinquad.png
+ \li \c Easing.OutInQuad
+ \li Easing curve for a quadratic (t^2) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinquad.png
\row
- \o \c Easing.InCubic
- \o Easing curve for a cubic (t^3) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-incubic.png
+ \li \c Easing.InCubic
+ \li Easing curve for a cubic (t^3) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-incubic.png
\row
- \o \c Easing.OutCubic
- \o Easing curve for a cubic (t^3) function: decelerating from zero velocity.
- \o \inlineimage qeasingcurve-outcubic.png
+ \li \c Easing.OutCubic
+ \li Easing curve for a cubic (t^3) function: decelerating from zero velocity.
+ \li \inlineimage qeasingcurve-outcubic.png
\row
- \o \c Easing.InOutCubic
- \o Easing curve for a cubic (t^3) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutcubic.png
+ \li \c Easing.InOutCubic
+ \li Easing curve for a cubic (t^3) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutcubic.png
\row
- \o \c Easing.OutInCubic
- \o Easing curve for a cubic (t^3) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outincubic.png
+ \li \c Easing.OutInCubic
+ \li Easing curve for a cubic (t^3) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outincubic.png
\row
- \o \c Easing.InQuart
- \o Easing curve for a quartic (t^4) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-inquart.png
+ \li \c Easing.InQuart
+ \li Easing curve for a quartic (t^4) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-inquart.png
\row
- \o \c Easing.OutQuart
- \o Easing curve for a quartic (t^4) function: decelerating from zero velocity.
- \o \inlineimage qeasingcurve-outquart.png
+ \li \c Easing.OutQuart
+ \li Easing curve for a quartic (t^4) function: decelerating from zero velocity.
+ \li \inlineimage qeasingcurve-outquart.png
\row
- \o \c Easing.InOutQuart
- \o Easing curve for a quartic (t^4) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutquart.png
+ \li \c Easing.InOutQuart
+ \li Easing curve for a quartic (t^4) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutquart.png
\row
- \o \c Easing.OutInQuart
- \o Easing curve for a quartic (t^4) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinquart.png
+ \li \c Easing.OutInQuart
+ \li Easing curve for a quartic (t^4) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinquart.png
\row
- \o \c Easing.InQuint
- \o Easing curve for a quintic (t^5) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-inquint.png
+ \li \c Easing.InQuint
+ \li Easing curve for a quintic (t^5) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-inquint.png
\row
- \o \c Easing.OutQuint
- \o Easing curve for a quintic (t^5) function: decelerating from zero velocity.
- \o \inlineimage qeasingcurve-outquint.png
+ \li \c Easing.OutQuint
+ \li Easing curve for a quintic (t^5) function: decelerating from zero velocity.
+ \li \inlineimage qeasingcurve-outquint.png
\row
- \o \c Easing.InOutQuint
- \o Easing curve for a quintic (t^5) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutquint.png
+ \li \c Easing.InOutQuint
+ \li Easing curve for a quintic (t^5) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutquint.png
\row
- \o \c Easing.OutInQuint
- \o Easing curve for a quintic (t^5) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinquint.png
+ \li \c Easing.OutInQuint
+ \li Easing curve for a quintic (t^5) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinquint.png
\row
- \o \c Easing.InSine
- \o Easing curve for a sinusoidal (sin(t)) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-insine.png
+ \li \c Easing.InSine
+ \li Easing curve for a sinusoidal (sin(t)) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-insine.png
\row
- \o \c Easing.OutSine
- \o Easing curve for a sinusoidal (sin(t)) function: decelerating from zero velocity.
- \o \inlineimage qeasingcurve-outsine.png
+ \li \c Easing.OutSine
+ \li Easing curve for a sinusoidal (sin(t)) function: decelerating from zero velocity.
+ \li \inlineimage qeasingcurve-outsine.png
\row
- \o \c Easing.InOutSine
- \o Easing curve for a sinusoidal (sin(t)) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutsine.png
+ \li \c Easing.InOutSine
+ \li Easing curve for a sinusoidal (sin(t)) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutsine.png
\row
- \o \c Easing.OutInSine
- \o Easing curve for a sinusoidal (sin(t)) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinsine.png
+ \li \c Easing.OutInSine
+ \li Easing curve for a sinusoidal (sin(t)) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinsine.png
\row
- \o \c Easing.InExpo
- \o Easing curve for an exponential (2^t) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-inexpo.png
+ \li \c Easing.InExpo
+ \li Easing curve for an exponential (2^t) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-inexpo.png
\row
- \o \c Easing.OutExpo
- \o Easing curve for an exponential (2^t) function: decelerating from zero velocity.
- \o \inlineimage qeasingcurve-outexpo.png
+ \li \c Easing.OutExpo
+ \li Easing curve for an exponential (2^t) function: decelerating from zero velocity.
+ \li \inlineimage qeasingcurve-outexpo.png
\row
- \o \c Easing.InOutExpo
- \o Easing curve for an exponential (2^t) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutexpo.png
+ \li \c Easing.InOutExpo
+ \li Easing curve for an exponential (2^t) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutexpo.png
\row
- \o \c Easing.OutInExpo
- \o Easing curve for an exponential (2^t) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinexpo.png
+ \li \c Easing.OutInExpo
+ \li Easing curve for an exponential (2^t) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinexpo.png
\row
- \o \c Easing.InCirc
- \o Easing curve for a circular (sqrt(1-t^2)) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-incirc.png
+ \li \c Easing.InCirc
+ \li Easing curve for a circular (sqrt(1-t^2)) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-incirc.png
\row
- \o \c Easing.OutCirc
- \o Easing curve for a circular (sqrt(1-t^2)) function: decelerating from zero velocity.
- \o \inlineimage qeasingcurve-outcirc.png
+ \li \c Easing.OutCirc
+ \li Easing curve for a circular (sqrt(1-t^2)) function: decelerating from zero velocity.
+ \li \inlineimage qeasingcurve-outcirc.png
\row
- \o \c Easing.InOutCirc
- \o Easing curve for a circular (sqrt(1-t^2)) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutcirc.png
+ \li \c Easing.InOutCirc
+ \li Easing curve for a circular (sqrt(1-t^2)) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutcirc.png
\row
- \o \c Easing.OutInCirc
- \o Easing curve for a circular (sqrt(1-t^2)) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outincirc.png
+ \li \c Easing.OutInCirc
+ \li Easing curve for a circular (sqrt(1-t^2)) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outincirc.png
\row
- \o \c Easing.InElastic
- \o Easing curve for an elastic (exponentially decaying sine wave) function: accelerating from zero velocity.
+ \li \c Easing.InElastic
+ \li Easing curve for an elastic (exponentially decaying sine wave) function: accelerating from zero velocity.
\br The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter.
- \o \inlineimage qeasingcurve-inelastic.png
+ \li \inlineimage qeasingcurve-inelastic.png
\row
- \o \c Easing.OutElastic
- \o Easing curve for an elastic (exponentially decaying sine wave) function: decelerating from zero velocity.
+ \li \c Easing.OutElastic
+ \li Easing curve for an elastic (exponentially decaying sine wave) function: decelerating from zero velocity.
\br The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter.
- \o \inlineimage qeasingcurve-outelastic.png
+ \li \inlineimage qeasingcurve-outelastic.png
\row
- \o \c Easing.InOutElastic
- \o Easing curve for an elastic (exponentially decaying sine wave) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutelastic.png
+ \li \c Easing.InOutElastic
+ \li Easing curve for an elastic (exponentially decaying sine wave) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutelastic.png
\row
- \o \c Easing.OutInElastic
- \o Easing curve for an elastic (exponentially decaying sine wave) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinelastic.png
+ \li \c Easing.OutInElastic
+ \li Easing curve for an elastic (exponentially decaying sine wave) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinelastic.png
\row
- \o \c Easing.InBack
- \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-inback.png
+ \li \c Easing.InBack
+ \li Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-inback.png
\row
- \o \c Easing.OutBack
- \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing out: decelerating to zero velocity.
- \o \inlineimage qeasingcurve-outback.png
+ \li \c Easing.OutBack
+ \li Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing out: decelerating to zero velocity.
+ \li \inlineimage qeasingcurve-outback.png
\row
- \o \c Easing.InOutBack
- \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in/out: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutback.png
+ \li \c Easing.InOutBack
+ \li Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in/out: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutback.png
\row
- \o \c Easing.OutInBack
- \o Easing curve for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out/in: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinback.png
+ \li \c Easing.OutInBack
+ \li Easing curve for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out/in: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinback.png
\row
- \o \c Easing.InBounce
- \o Easing curve for a bounce (exponentially decaying parabolic bounce) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-inbounce.png
+ \li \c Easing.InBounce
+ \li Easing curve for a bounce (exponentially decaying parabolic bounce) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-inbounce.png
\row
- \o \c Easing.OutBounce
- \o Easing curve for a bounce (exponentially decaying parabolic bounce) function: decelerating from zero velocity.
- \o \inlineimage qeasingcurve-outbounce.png
+ \li \c Easing.OutBounce
+ \li Easing curve for a bounce (exponentially decaying parabolic bounce) function: decelerating from zero velocity.
+ \li \inlineimage qeasingcurve-outbounce.png
\row
- \o \c Easing.InOutBounce
- \o Easing curve for a bounce (exponentially decaying parabolic bounce) function easing in/out: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutbounce.png
+ \li \c Easing.InOutBounce
+ \li Easing curve for a bounce (exponentially decaying parabolic bounce) function easing in/out: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutbounce.png
\row
- \o \c Easing.OutInBounce
- \o Easing curve for a bounce (exponentially decaying parabolic bounce) function easing out/in: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinbounce.png
+ \li \c Easing.OutInBounce
+ \li Easing curve for a bounce (exponentially decaying parabolic bounce) function easing out/in: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinbounce.png
\row
- \o \c Easing.Bezier
- \o Custom easing curve defined by the easing.bezierCurve property.
- \o
+ \li \c Easing.Bezier
+ \li Custom easing curve defined by the easing.bezierCurve property.
+ \li
\endtable
\c easing.amplitude is only applicable for bounce and elastic curves (curves of type
@@ -2290,8 +2290,8 @@ void QQuickPropertyAnimation::setProperties(const QString &prop)
\table 80%
\row
- \o Value Source / Behavior
- \o When an animation is used as a value source or in a Behavior, the default target and property
+ \li Value Source / Behavior
+ \li When an animation is used as a value source or in a Behavior, the default target and property
name to be animated can both be inferred.
\qml
Rectangle {
@@ -2303,8 +2303,8 @@ void QQuickPropertyAnimation::setProperties(const QString &prop)
}
\endqml
\row
- \o Transition
- \o When used in a transition, a property animation is assumed to match \e all targets
+ \li Transition
+ \li When used in a transition, a property animation is assumed to match \e all targets
but \e no properties. In practice, that means you need to specify at least the properties
in order for the animation to do anything.
\qml
@@ -2328,8 +2328,8 @@ void QQuickPropertyAnimation::setProperties(const QString &prop)
}
\endqml
\row
- \o Standalone
- \o When an animation is used standalone, both the target and property need to be
+ \li Standalone
+ \li When an animation is used standalone, both the target and property need to be
explicitly specified.
\qml
Rectangle {
diff --git a/src/quick/util/qquickanimationcontroller.cpp b/src/quick/util/qquickanimationcontroller.cpp
index a3e343f26d..2b5d174caa 100644
--- a/src/quick/util/qquickanimationcontroller.cpp
+++ b/src/quick/util/qquickanimationcontroller.cpp
@@ -174,6 +174,7 @@ void QQuickAnimationController::reload()
if (oldInstance && oldInstance != d->animationInstance)
delete oldInstance;
d->animationInstance->setLoopCount(1);
+ d->animationInstance->setDisableUserControl();
d->animationInstance->start();
d->animationInstance->pause();
updateProgress();
@@ -186,6 +187,7 @@ void QQuickAnimationController::updateProgress()
if (!d->animationInstance)
return;
+ d->animationInstance->setDisableUserControl();
d->animationInstance->start();
QQmlAnimationTimer::unregisterAnimation(d->animationInstance);
d->animationInstance->setCurrentTime(d->progress * d->animationInstance->duration());
diff --git a/src/quick/util/qquickconnections.cpp b/src/quick/util/qquickconnections.cpp
index 6e176fde3d..533c7013ef 100644
--- a/src/quick/util/qquickconnections.cpp
+++ b/src/quick/util/qquickconnections.cpp
@@ -91,9 +91,9 @@ public:
cases, such as when:
\list
- \i Multiple connections to the same signal are required
- \i Creating connections outside the scope of the signal sender
- \i Connecting to targets not defined in QML
+ \li Multiple connections to the same signal are required
+ \li Creating connections outside the scope of the signal sender
+ \li Connecting to targets not defined in QML
\endlist
When any of these are needed, the Connections element can be used instead.
diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp
index 438d00bd1b..55830f0cc8 100644
--- a/src/quick/util/qquickfontloader.cpp
+++ b/src/quick/util/qquickfontloader.cpp
@@ -295,22 +295,22 @@ void QQuickFontLoader::setName(const QString &name)
This property holds the status of font loading. It can be one of:
\list
- \o FontLoader.Null - no font has been set
- \o FontLoader.Ready - the font has been loaded
- \o FontLoader.Loading - the font is currently being loaded
- \o FontLoader.Error - an error occurred while loading the font
+ \li FontLoader.Null - no font has been set
+ \li FontLoader.Ready - the font has been loaded
+ \li FontLoader.Loading - the font is currently being loaded
+ \li FontLoader.Error - an error occurred while loading the font
\endlist
Use this status to provide an update or respond to the status change in some way.
For example, you could:
\list
- \o Trigger a state change:
+ \li Trigger a state change:
\qml
State { name: 'loaded'; when: loader.status == FontLoader.Ready }
\endqml
- \o Implement an \c onStatusChanged signal handler:
+ \li Implement an \c onStatusChanged signal handler:
\qml
FontLoader {
id: loader
@@ -318,7 +318,7 @@ void QQuickFontLoader::setName(const QString &name)
}
\endqml
- \o Bind to the status value:
+ \li Bind to the status value:
\qml
Text { text: loader.status == FontLoader.Ready ? 'Loaded' : 'Not loaded' }
\endqml
diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp
index dc85230943..a5d2720cea 100644
--- a/src/quick/util/qquickimageprovider.cpp
+++ b/src/quick/util/qquickimageprovider.cpp
@@ -117,12 +117,12 @@ QImage QQuickTextureFactory::image() const
in QML applications. It allows images in QML to be:
\list
- \o Loaded using QPixmaps rather than actual image files
- \o Loaded asynchronously in a separate thread, if imageType() is \l{QQuickImageProvider::ImageType}{ImageType::Image}
+ \li Loaded using QPixmaps rather than actual image files
+ \li Loaded asynchronously in a separate thread, if imageType() is \l{QQmlImageProvider::ImageType}{ImageType::Image}
\endlist
To specify that an image should be loaded by an image provider, use the
- \bold {"image:"} scheme for the URL source of the image, followed by the
+ \b {"image:"} scheme for the URL source of the image, followed by the
identifiers of the image provider and the requested image. For example:
\qml
diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp
index b6a01bfe3e..adf4242cdc 100644
--- a/src/quick/util/qquickpath.cpp
+++ b/src/quick/util/qquickpath.cpp
@@ -171,14 +171,14 @@ bool QQuickPath::hasEnd() const
A path can contain the following path objects:
\list
- \i \l PathLine - a straight line to a given position.
- \i \l PathQuad - a quadratic Bezier curve to a given position with a control point.
- \i \l PathCubic - a cubic Bezier curve to a given position with two control points.
- \i \l PathArc - an arc to a given position with a radius.
- \i \l PathSvg - a path specified as an SVG path data string.
- \i \l PathCurve - a point on a Catmull-Rom curve.
- \i \l PathAttribute - an attribute at a given position in the path.
- \i \l PathPercent - a way to spread out items along various segments of the path.
+ \li \l PathLine - a straight line to a given position.
+ \li \l PathQuad - a quadratic Bezier curve to a given position with a control point.
+ \li \l PathCubic - a cubic Bezier curve to a given position with two control points.
+ \li \l PathArc - an arc to a given position with a radius.
+ \li \l PathSvg - a path specified as an SVG path data string.
+ \li \l PathCurve - a point on a Catmull-Rom curve.
+ \li \l PathAttribute - an attribute at a given position in the path.
+ \li \l PathPercent - a way to spread out items along various segments of the path.
\endlist
\snippet doc/src/snippets/qml/pathview/pathattributes.qml 2
@@ -808,8 +808,8 @@ bool QQuickCurve::hasRelativeY()
\table
\row
- \o \image declarative-pathattribute.png
- \o
+ \li \image declarative-pathattribute.png
+ \li
\snippet doc/src/snippets/qml/pathview/pathattributes.qml 0
(see the PathView documentation for the specification of ContactModel.qml
used for ContactModel above.)
@@ -970,8 +970,8 @@ void QQuickPathLine::addToPath(QPainterPath &path, const QQuickPathData &data)
The following QML produces the path shown below:
\table
\row
- \o \image declarative-pathquad.png
- \o
+ \li \image declarative-pathquad.png
+ \li
\qml
Path {
startX: 0; startY: 0
@@ -1121,8 +1121,8 @@ void QQuickPathQuad::addToPath(QPainterPath &path, const QQuickPathData &data)
The following QML produces the path shown below:
\table
\row
- \o \image declarative-pathcubic.png
- \o
+ \li \image declarative-pathcubic.png
+ \li
\qml
Path {
startX: 20; startY: 0
@@ -1492,8 +1492,8 @@ void QQuickPathCatmullRomCurve::addToPath(QPainterPath &path, const QQuickPathDa
The following QML produces the path shown below:
\table
\row
- \o \image declarative-patharc.png
- \o \snippet doc/src/snippets/qml/path/basicarc.qml 0
+ \li \image declarative-patharc.png
+ \li \snippet doc/src/snippets/qml/path/basicarc.qml 0
\endtable
Note that a single PathArc cannot be used to specify a circle. Instead, you can
@@ -1536,8 +1536,8 @@ void QQuickPathCatmullRomCurve::addToPath(QPainterPath &path, const QQuickPathDa
the shape of the arc:
\table
\row
- \o \image declarative-arcradius.png
- \o \snippet doc/src/snippets/qml/path/arcradius.qml 0
+ \li \image declarative-arcradius.png
+ \li \snippet doc/src/snippets/qml/path/arcradius.qml 0
\endtable
*/
@@ -1581,8 +1581,8 @@ void QQuickPathArc::setRadiusY(qreal radius)
\table
\row
- \o \image declarative-largearc.png
- \o \snippet doc/src/snippets/qml/path/largearc.qml 0
+ \li \image declarative-largearc.png
+ \li \snippet doc/src/snippets/qml/path/largearc.qml 0
\endtable
The default value is false.
@@ -1612,8 +1612,8 @@ void QQuickPathArc::setUseLargeArc(bool largeArc)
by changing the value of direction.
\table
\row
- \o \image declarative-arcdirection.png
- \o \snippet doc/src/snippets/qml/path/arcdirection.qml 0
+ \li \image declarative-arcdirection.png
+ \li \snippet doc/src/snippets/qml/path/arcdirection.qml 0
\endtable
\sa useLargeArc
@@ -1659,8 +1659,8 @@ void QQuickPathArc::addToPath(QPainterPath &path, const QQuickPathData &data)
The following QML produces the path shown below:
\table
\row
- \o \image declarative-pathsvg.png
- \o
+ \li \image declarative-pathsvg.png
+ \li
\qml
Path {
startX: 50; startY: 50
@@ -1717,8 +1717,8 @@ void QQuickPathSvg::addToPath(QPainterPath &path, const QQuickPathData &)
PathLine section of the path.
\table
\row
- \o \image declarative-nopercent.png
- \o
+ \li \image declarative-nopercent.png
+ \li
\qml
PathView {
// ...
@@ -1731,8 +1731,8 @@ void QQuickPathSvg::addToPath(QPainterPath &path, const QQuickPathData &)
}
\endqml
\row
- \o \image declarative-percent.png
- \o
+ \li \image declarative-percent.png
+ \li
\qml
PathView {
// ...
diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp
index 5c73e519e1..801b007cdd 100644
--- a/src/quick/util/qquickpixmapcache.cpp
+++ b/src/quick/util/qquickpixmapcache.cpp
@@ -1001,7 +1001,6 @@ static QQuickPixmapData* createPixmapDataSync(QQuickPixmap *declarativePixmap, Q
struct QQuickPixmapNull {
QUrl url;
- QImage image;
QSize size;
};
Q_GLOBAL_STATIC(QQuickPixmapNull, nullPixmap);
@@ -1104,8 +1103,7 @@ QImage QQuickPixmap::image() const
{
if (d && d->textureFactory)
return d->textureFactory->image();
- else
- return nullPixmap()->image;
+ return QImage();
}
void QQuickPixmap::setImage(const QImage &p)
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index 83ddb2530e..8b0818c96c 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -478,12 +478,11 @@ QQuickPropertyChanges::ActionList QQuickPropertyChanges::actions()
QQmlBinding::Identifier id = d->expressions.at(ii).id;
QQmlBinding *newBinding = id != QQmlBinding::Invalid ? QQmlBinding::createBinding(id, object(), qmlContext(this), e->sourceFile(), e->lineNumber()) : 0;
- if (!newBinding) {
- newBinding = new QQmlBinding(e->expression(), object(), qmlContext(this));
- newBinding->setSourceLocation(e->sourceFile(), e->lineNumber(), e->columnNumber());
- }
+ if (!newBinding)
+ newBinding = new QQmlBinding(e->expression(), false, object(), QQmlContextData::get(qmlContext(this)),
+ e->sourceFile(), e->lineNumber(), e->columnNumber());
newBinding->setTarget(prop);
- a.toBinding = newBinding;
+ a.toBinding = QQmlAbstractBinding::getPointer(newBinding);
a.deletableToBinding = true;
}
@@ -682,7 +681,7 @@ void QQuickPropertyChanges::changeExpression(const QString &name, const QString
} else {
QQmlBinding *newBinding = new QQmlBinding(newExpression->expression(), object(), qmlContext(this));
newBinding->setTarget(d->property(name));
- action.toBinding = newBinding;
+ action.toBinding = QQmlAbstractBinding::getPointer(newBinding);
action.deletableToBinding = true;
state()->addEntryToRevertList(action);
diff --git a/src/quick/util/qquicksmoothedanimation.cpp b/src/quick/util/qquicksmoothedanimation.cpp
index 024728f1f5..1ad9372917 100644
--- a/src/quick/util/qquicksmoothedanimation.cpp
+++ b/src/quick/util/qquicksmoothedanimation.cpp
@@ -450,9 +450,9 @@ QAbstractAnimationJob* QQuickSmoothedAnimation::transition(QQuickStateActions &a
Possible values are:
\list
- \o SmoothedAnimation.Eased (default) - the animation will smoothly decelerate, and then reverse direction
- \o SmoothedAnimation.Immediate - the animation will immediately begin accelerating in the reverse direction, beginning with a velocity of 0
- \o SmoothedAnimation.Sync - the property is immediately set to the target value
+ \li SmoothedAnimation.Eased (default) - the animation will smoothly decelerate, and then reverse direction
+ \li SmoothedAnimation.Immediate - the animation will immediately begin accelerating in the reverse direction, beginning with a velocity of 0
+ \li SmoothedAnimation.Sync - the property is immediately set to the target value
\endlist
*/
QQuickSmoothedAnimation::ReversingMode QQuickSmoothedAnimation::reversingMode() const
diff --git a/src/quick/util/qquicksystempalette.cpp b/src/quick/util/qquicksystempalette.cpp
index 735d18abf5..2417d573c4 100644
--- a/src/quick/util/qquicksystempalette.cpp
+++ b/src/quick/util/qquicksystempalette.cpp
@@ -267,9 +267,9 @@ QColor QQuickSystemPalette::highlightedText() const
The color group of the palette. This can be one of:
\list
- \o SystemPalette.Active (default)
- \o SystemPalette.Inactive
- \o SystemPalette.Disabled
+ \li SystemPalette.Active (default)
+ \li SystemPalette.Inactive
+ \li SystemPalette.Disabled
\endlist
\sa QPalette::ColorGroup
diff --git a/src/quick/util/qquicktimeline.cpp b/src/quick/util/qquicktimeline.cpp
index 3e8b36714a..61aefaf0a3 100644
--- a/src/quick/util/qquicktimeline.cpp
+++ b/src/quick/util/qquicktimeline.cpp
@@ -259,7 +259,7 @@ qreal QQuickTimeLinePrivate::value(const Op &op, int time, qreal base, bool *cha
QQuickTimeLine is similar to QTimeLine except:
\list
- \i It updates QQuickTimeLineValue instances directly, rather than maintaining a single
+ \li It updates QQuickTimeLineValue instances directly, rather than maintaining a single
current value.
For example, the following animates a simple value over 200 milliseconds:
@@ -274,7 +274,7 @@ qreal QQuickTimeLinePrivate::value(const Op &op, int time, qreal base, bool *cha
connect to the QQuickTimeLine's updated() signal, or inherit from QQuickTimeLineValue
and reimplement the QQuickTimeLineValue::setValue() method.
- \i Supports multiple QQuickTimeLineValue, arbitrary start and end values and allows
+ \li Supports multiple QQuickTimeLineValue, arbitrary start and end values and allows
animations to be strung together for more complex effects.
For example, the following animation moves the x and y coordinates of
@@ -294,7 +294,7 @@ qreal QQuickTimeLinePrivate::value(const Op &op, int time, qreal base, bool *cha
tl.move(y, 200., 50);
\endcode
- \i All QQuickTimeLine instances share a single, synchronized clock.
+ \li All QQuickTimeLine instances share a single, synchronized clock.
Actions scheduled within the same event loop tick are scheduled
synchronously against each other, regardless of the wall time between the
@@ -585,10 +585,10 @@ void QQuickTimeLine::sync(QQuickTimeLineValue &timeLineValue)
will result in:
\table
- \header \o \o 0ms \o 50ms \o 100ms \o 150ms \o 200ms \o 250ms \o 300ms
- \row \o value1 \o 0 \o 2.5 \o 5.0 \o 7.5 \o 10 \o 10 \o 10
- \row \o value2 \o 0 \o 5.0 \o 10.0 \o 10.0 \o 10.0 \o 15.0 \o 20.0
- \row \o value2 \o 0 \o 0 \o 0 \o 0 \o 0 \o 10.0 \o 20.0
+ \header \li \li 0ms \li 50ms \li 100ms \li 150ms \li 200ms \li 250ms \li 300ms
+ \row \li value1 \li 0 \li 2.5 \li 5.0 \li 7.5 \li 10 \li 10 \li 10
+ \row \li value2 \li 0 \li 5.0 \li 10.0 \li 10.0 \li 10.0 \li 15.0 \li 20.0
+ \row \li value2 \li 0 \li 0 \li 0 \li 0 \li 0 \li 10.0 \li 20.0
\endtable
*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 23:26:06 +0000