diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2012-01-26 16:55:27 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-27 10:18:31 +0100 |
| commit | 8aa187fec80810d37107341ca6dc53264187ae9d (patch) | |
| tree | a914ab1cc1384360fe02174f2f3f2eba9c1b852f /src/quick/items/context2d | |
| parent | 6ca82a4130cebf1e1b6d7599a72b339bb3a2dada (diff) | |
Rename QSGTexture::textureSubRect to normalizedTextureSubRect()
Change-Id: Id61cdaf1078d7b61d39644a80df8067f4ce4ceb0
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Diffstat (limited to 'src/quick/items/context2d')
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2dnode.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2dtexture.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2dtexture_p.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/context2d/qquickcontext2dnode.cpp b/src/quick/items/context2d/qquickcontext2dnode.cpp index d2508bd996..94a944c69c 100644 --- a/src/quick/items/context2d/qquickcontext2dnode.cpp +++ b/src/quick/items/context2d/qquickcontext2dnode.cpp @@ -115,7 +115,7 @@ void QQuickContext2DNode::updateTexture() void QQuickContext2DNode::updateGeometry() { - QRectF source = m_texture->textureSubRect(); + QRectF source = m_texture->normalizedTextureSubRect(); QSGGeometry::updateTexturedRectGeometry(&m_geometry, QRectF(0, 0, m_size.width(), m_size.height()), source); diff --git a/src/quick/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp index 1b3b13dd48..24cb3432a0 100644 --- a/src/quick/items/context2d/qquickcontext2dtexture.cpp +++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp @@ -468,7 +468,7 @@ void QQuickContext2DFBOTexture::bind() updateBindOptions(); } -QRectF QQuickContext2DFBOTexture::textureSubRect() const +QRectF QQuickContext2DFBOTexture::normalizedTextureSubRect() const { return QRectF(0 , 0 diff --git a/src/quick/items/context2d/qquickcontext2dtexture_p.h b/src/quick/items/context2d/qquickcontext2dtexture_p.h index fdcac0f2d9..0a81decd02 100644 --- a/src/quick/items/context2d/qquickcontext2dtexture_p.h +++ b/src/quick/items/context2d/qquickcontext2dtexture_p.h @@ -138,7 +138,7 @@ public: virtual QImage toImage(const QRectF& region = QRectF()); virtual QPaintDevice* beginPainting(); virtual void endPainting(); - QRectF textureSubRect() const; + QRectF normalizedTextureSubRect() const; virtual bool supportThreadRendering() const {return false;} virtual bool supportDirectRendering() const {return false;} virtual QQuickCanvasItem::RenderTarget renderTarget() const; |