diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-06-19 17:50:11 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-06-19 17:50:36 +0200 |
| commit | 8af287965907e785afefaa4dd010834a76f2d0f4 (patch) | |
| tree | 100f98b1876d72821c6fd3b67631e97fd142aa50 /src/quick/scenegraph/util/qsgtexturematerial.cpp | |
| parent | 6f2bdb816dc816461cf3888eb732f71904b6a7ab (diff) | |
| parent | ee076afedccbe1d37306a7972051f84eb036d655 (diff) | |
Merge branch 'wip/scenegraphng' into dev
Say hello to Shape.
Change-Id: I1093feee4acc375e62bae1d351db0a7969a536d0
Diffstat (limited to 'src/quick/scenegraph/util/qsgtexturematerial.cpp')
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexturematerial.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/scenegraph/util/qsgtexturematerial.cpp b/src/quick/scenegraph/util/qsgtexturematerial.cpp index c536445e82..fbc8f27a63 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial.cpp +++ b/src/quick/scenegraph/util/qsgtexturematerial.cpp @@ -280,7 +280,7 @@ void QSGOpaqueTextureMaterial::setTexture(QSGTexture *texture) Returns this material's horizontal wrap mode. - The default horizontal wrap mode is \c QSGTexutre::ClampToEdge. + The default horizontal wrap mode is \c QSGTexture::ClampToEdge. */ @@ -301,7 +301,7 @@ void QSGOpaqueTextureMaterial::setTexture(QSGTexture *texture) Returns this material's vertical wrap mode. - The default vertical wrap mode is \c QSGTexutre::ClampToEdge. + The default vertical wrap mode is \c QSGTexture::ClampToEdge. */ |