diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 18:46:38 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 19:02:37 +0200 |
| commit | c2f8b9535d34da6948ccf45b7d5fd90de2f1bc9e (patch) | |
| tree | c6f7e058a985d7c18b51cadc76283caf555071c9 /examples/quick/imageelements | |
| parent | 9e633bbda7608ac0231809e2a6a97ae8f2d849d6 (diff) | |
| parent | 803f18f02e5609a1ca00a5b78ea6d3613d44e1a0 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Removed dependencies.yaml because we don't use it yet in wip/cmake.
Fixed conflict in qmlcachegen.cpp.
Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922
Diffstat (limited to 'examples/quick/imageelements')
| -rw-r--r-- | examples/quick/imageelements/doc/src/imageelements.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/quick/imageelements/doc/src/imageelements.qdoc b/examples/quick/imageelements/doc/src/imageelements.qdoc index 2c6490fb2c..4c00915e56 100644 --- a/examples/quick/imageelements/doc/src/imageelements.qdoc +++ b/examples/quick/imageelements/doc/src/imageelements.qdoc @@ -38,12 +38,12 @@ \section1 Scaling with BorderImage - \e BorderImage shows off the various scaling modes of the \l BorderImage + \e BorderImage shows the various scaling modes of the \l BorderImage type by setting its horizontalTileMode and verticalTileMode properties. \section1 Image Fill - \e Image shows off the various fill modes of the \l Image type. + \e Image shows the various fill modes of the \l Image type. \section1 Shadow Effects |