aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickspriteimage_p.h
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-02-07 12:40:53 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-07 03:55:39 +0100
commitf2fa12b7d61cbe3e8d0a5372478172545856dfd4 (patch)
tree500202dfe363433bec8af6b7d40945a19e328ece /src/quick/items/qquickspriteimage_p.h
parent60a6f896906c3b03d75562519044fa81ee9c4bc1 (diff)
Fix symbol clash
SpriteImage and ImageParticle are now in the same library, need different internal class names. Change-Id: Ic32fafb729818a6114fe454e7288fbf00fd6a1e7 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquickspriteimage_p.h')
-rw-r--r--src/quick/items/qquickspriteimage_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickspriteimage_p.h b/src/quick/items/qquickspriteimage_p.h
index 092df3f13e..8017263bb1 100644
--- a/src/quick/items/qquickspriteimage_p.h
+++ b/src/quick/items/qquickspriteimage_p.h
@@ -53,7 +53,7 @@ class QSGContext;
class QQuickSprite;
class QQuickSpriteEngine;
class QSGGeometryNode;
-class QQuickSpriteMaterial;
+class QQuickSpriteImageMaterial;
class Q_AUTOTEST_EXPORT QQuickSpriteImage : public QQuickItem
{
Q_OBJECT
@@ -127,7 +127,7 @@ private:
void prepareNextFrame();
QSGGeometryNode* buildNode();
QSGGeometryNode *m_node;
- QQuickSpriteMaterial *m_material;
+ QQuickSpriteImageMaterial *m_material;
QList<QQuickSprite*> m_sprites;
QQuickSpriteEngine* m_spriteEngine;
QTime m_timestamp;