aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2012-02-08 08:09:11 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-09 10:57:21 +0100
commit6c041f2122920307a2506067fdf64f65c614fbf7 (patch)
tree5e257977d83850c622598faeca203960a5c01b4d /src/declarative
parent8550ed69156f0472450fd11aabcaa5d4dcc676db (diff)
Pass the QQuickCanvas to texture factories.
This makes it a lot more convenient as we then have direct access to the GL context, createTexture(), invalidation signal and more. Change-Id: I114514d1379c4d0efcc35c512fa2b485da3438b0 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/qml/qdeclarativeimageprovider.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeimageprovider.h b/src/declarative/qml/qdeclarativeimageprovider.h
index 8fc79aeee2..55a5ca2d23 100644
--- a/src/declarative/qml/qdeclarativeimageprovider.h
+++ b/src/declarative/qml/qdeclarativeimageprovider.h
@@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE
class QDeclarativeImageProviderPrivate;
class QSGTexture;
+class QQuickCanvas;
class Q_DECLARATIVE_EXPORT QDeclarativeTextureFactory : public QObject
{
@@ -59,7 +60,7 @@ public:
QDeclarativeTextureFactory();
~QDeclarativeTextureFactory();
- virtual QSGTexture *createTexture() const = 0;
+ virtual QSGTexture *createTexture(QQuickCanvas *canvas) const = 0;
virtual QSize textureSize() const = 0;
virtual int textureByteCount() const = 0;
};