diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-19 09:47:35 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-19 09:47:35 +0200 |
| commit | d2628d9d7015e4b75007471d150acedecaa0c6c1 (patch) | |
| tree | 00ab012c7ae190d5a64788ee945ca006e3759e41 /src/quick/items/context2d | |
| parent | b6a6a6387e279c431d520243345530fa19bd96c5 (diff) | |
| parent | 566afc2d2e4156712ffec081715f12307cf46628 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/quick/qquickgridview/qquickgridview.pro
tests/auto/quick/qquickitem/qquickitem.pro
Change-Id: Ic54cafbdda1ac22757d2ee65dcc63a1b167c7556
Diffstat (limited to 'src/quick/items/context2d')
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2dtexture.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 55fb8b7fc5..c1df858310 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -601,7 +601,7 @@ void QQuickCanvasItem::geometryChanged(const QRectF &newGeometry, const QRectF & emit canvasWindowChanged(); } - if (d->available) + if (d->available && newSize != oldGeometry.size()) requestPaint(); } diff --git a/src/quick/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp index 84ab5bb8fb..adba4b3059 100644 --- a/src/quick/items/context2d/qquickcontext2dtexture.cpp +++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp @@ -585,8 +585,8 @@ QQuickCanvasItem::RenderTarget QQuickContext2DImageTexture::renderTarget() const void QQuickContext2DImageTexture::bind() { + imageTexture()->setFiltering(filtering()); imageTexture()->bind(); - updateBindOptions(); } bool QQuickContext2DImageTexture::updateTexture() |