diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:01:10 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:01:10 +0200 |
| commit | 8b74455c1fb52852b3eb2401385d28cd0f4e9a6f (patch) | |
| tree | d0a54a8cafacdef71176c1be37356bdb5b5d33a7 /src/doc | |
| parent | eacf5d4302aa161cf146df68bf18bb4093b13574 (diff) | |
| parent | b63aaf574c6b4b5a40e2f137f077c694bcf79ae0 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I0f68ab1277617c32b1c31f29d8793d23d9909208
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/src/qmlextramaterials.qdoc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/doc/src/qmlextramaterials.qdoc b/src/doc/src/qmlextramaterials.qdoc index c54cc948b..e0a2e9edf 100644 --- a/src/doc/src/qmlextramaterials.qdoc +++ b/src/doc/src/qmlextramaterials.qdoc @@ -69,6 +69,10 @@ Holds the current texture scale. It is applied as a multiplier to texture coordinates at render time. Defaults to 1.0. + + When used in conjunction with WrapMode.Repeat, textureScale provides a simple + way to tile a texture across a surface. For example, a texture scale of \c 4.0 + would result in 16 (4x4) tiles. */ /*! \qmlproperty TextureImage DiffuseMapMaterial::diffuse @@ -152,6 +156,10 @@ Holds the current texture scale. It is applied as a multiplier to texture coordinates at render time. Defaults to 1.0. + + When used in conjunction with WrapMode.Repeat, textureScale provides a simple + way to tile a texture across a surface. For example, a texture scale of \c 4.0 + would result in 16 (4x4) tiles. */ /*! @@ -292,6 +300,10 @@ Holds the current texture scale. It is applied as a multiplier to texture coordinates at render time. Defaults to 1.0. + + When used in conjunction with WrapMode.Repeat, textureScale provides a simple + way to tile a texture across a surface. For example, a texture scale of \c 4.0 + would result in 16 (4x4) tiles. */ /*! @@ -366,6 +378,10 @@ Holds the current texture scale. It is applied as a multiplier to texture coordinates at render time. Defaults to 1.0. + + When used in conjunction with WrapMode.Repeat, textureScale provides a simple + way to tile a texture across a surface. For example, a texture scale of \c 4.0 + would result in 16 (4x4) tiles. */ /*! @@ -449,6 +465,10 @@ Holds the current texture scale. It is applied as a multiplier to texture coordinates at render time. Defaults to 1.0. + + When used in conjunction with WrapMode.Repeat, textureScale provides a simple + way to tile a texture across a surface. For example, a texture scale of \c 4.0 + would result in 16 (4x4) tiles. */ /*! |