diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src/quick/items/qquickspriteimage.cpp | |
parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) |
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
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; } |