diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-05 09:01:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-05 09:31:34 +0200 |
| commit | 2795ac5d5930fa28ea329529c0dd2e515b361531 (patch) | |
| tree | 8dd01197f5b71e1eb8e3612b0119764623325803 /src/quick/util | |
| parent | 8f93d3627a9b76bf77896501129990e33a77f32c (diff) | |
| parent | 6ff0e9a65657e8c51a37e63efe8169bb7e3050cc (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quick/items/qquickwindow.cpp
src/quick/scenegraph/qsgrenderloop.cpp
Change-Id: Idd7106995b5545fcac869e9056a365ef9edb36ca
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickimageprovider.cpp | 6 | ||||
| -rw-r--r-- | src/quick/util/qquickpropertychanges.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp index b4a6b9e1f6..6ee5b95dc7 100644 --- a/src/quick/util/qquickimageprovider.cpp +++ b/src/quick/util/qquickimageprovider.cpp @@ -255,7 +255,7 @@ void QQuickImageResponse::cancel() If you want the rest of the URL to be case insensitive, you will have to take care of that yourself inside your image provider. - \section2 An example + \section2 An Example Here are two images. Their \c source values indicate they should be loaded by an image provider named "colors", and the images to be loaded are "yellow" @@ -301,7 +301,7 @@ void QQuickImageResponse::cancel() instead of registering it in the application \c main() function as shown above. - \section2 Asynchronous image loading + \section2 Asynchronous Image Loading Image providers that support QImage or Texture loading automatically include support for asychronous loading of images. To enable asynchronous loading for an @@ -330,7 +330,7 @@ void QQuickImageResponse::cancel() See the \l {imageresponseprovider}{Image Response Provider Example} for a complete implementation. - \section2 Image caching + \section2 Image Caching Images returned by a QQuickImageProvider are automatically cached, similar to any image loaded by the QML engine. When an image with a diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp index 8d76bd986f..61380b3ea0 100644 --- a/src/quick/util/qquickpropertychanges.cpp +++ b/src/quick/util/qquickpropertychanges.cpp @@ -101,7 +101,7 @@ QT_BEGIN_NAMESPACE \l {Item::}{parent} value, use ParentChange instead. - \section2 Resetting property values + \section2 Resetting Property Values The \c undefined value can be used to reset the property value for a state. In the following example, when \c myText changes to the \e widerText @@ -111,7 +111,7 @@ QT_BEGIN_NAMESPACE \snippet qml/propertychanges.qml reset - \section2 Immediate property changes in transitions + \section2 Immediate Property Changes in Transitions When \l{Animation and Transitions in Qt Quick}{Transitions} are used to animate state changes, they animate properties from their values in the current |