diff options
Diffstat (limited to 'src/quick/items/qquickspriteimage.cpp')
| -rw-r--r-- | src/quick/items/qquickspriteimage.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/items/qquickspriteimage.cpp b/src/quick/items/qquickspriteimage.cpp index 1b3b57710a..6edb3ad8c3 100644 --- a/src/quick/items/qquickspriteimage.cpp +++ b/src/quick/items/qquickspriteimage.cpp @@ -49,7 +49,7 @@ #include <QtQuick/qsgtexturematerial.h> #include <QtQuick/qsgtexture.h> #include <QtQuick/qquickcanvas.h> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> #include <QFile> #include <cmath> #include <qmath.h> @@ -294,9 +294,9 @@ void QQuickSpriteImage::setGoalSprite(const QString &sprite) } } -QDeclarativeListProperty<QQuickSprite> QQuickSpriteImage::sprites() +QQmlListProperty<QQuickSprite> QQuickSpriteImage::sprites() { - return QDeclarativeListProperty<QQuickSprite>(this, &m_sprites, spriteAppend, spriteCount, spriteAt, spriteClear); + return QQmlListProperty<QQuickSprite>(this, &m_sprites, spriteAppend, spriteCount, spriteAt, spriteClear); } void QQuickSpriteImage::createEngine() @@ -327,11 +327,11 @@ QSGGeometryNode* QQuickSpriteImage::buildNode() if (!m_spriteEngine) { qmlInfo(this) << "No sprite engine..."; return 0; - } else if (m_spriteEngine->status() == QDeclarativePixmap::Null) { + } else if (m_spriteEngine->status() == QQuickPixmap::Null) { m_spriteEngine->startAssemblingImage(); update();//Schedule another update, where we will check again return 0; - } else if (m_spriteEngine->status() == QDeclarativePixmap::Loading) { + } else if (m_spriteEngine->status() == QQuickPixmap::Loading) { update();//Schedule another update, where we will check again return 0; } |