Commit e32eb8ee authored by Gunnar Sletta's avatar Gunnar Sletta Committed by Qt by Nokia
Browse files

Remove QSGContext and QSGTexture from QDeclarativePixmapData


In order to cleanly support multiple windows we need to not
have the QSGContext reference in QDeclarativeEngine and we
need to be able to have one copy of the texture for each
QSGContext that is not sharing when we have multiple windows.

This also makes it easier to the release graphical resources from
a running application, which is another feature that we want
to eventually implement.

This patch does remove an adaptation feature which is the
decodeToTexture, which seemed like a good idea at the time
but in hindsight has not been used for anything.

Edit: resolved conflict in qquickimage.cpp
Edit: updated QDeclarativePixmap testcase
Edit: updated QQuickImage testcase
Edit: Rebased on top of QDeclarativePixmapCacheChanges

Change-Id: Ifc61dd8158d3f841437d029b6031a91196145517
Reviewed-by: default avatarMartin Jones <martin.jones@nokia.com>
parent 310618d5
No related merge requests found
Showing with 208 additions and 264 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment