diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-03-09 11:43:03 +1000 |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-03-09 11:43:03 +1000 |
| commit | 9bd895158915313bb0ffae7fcfb24598cb1721fa (patch) | |
| tree | 0d634eabfd067ebb6338b62f038223e66500132b /src/declarative/graphicsitems/qdeclarativeimagebase.cpp | |
| parent | db0c932bf816b76547798ec62336e25b453d29b8 (diff) | |
| download | qt4-tools-9bd895158915313bb0ffae7fcfb24598cb1721fa.tar.gz | |
Move pixmapChanged signal to QDeclarativeImage
Task-number: QTBUG-6334
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeimagebase.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeimagebase.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp index 0e9638d558..e65c9d1da6 100644 --- a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp +++ b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp @@ -144,19 +144,19 @@ void QDeclarativeImageBase::load() static int thisRequestProgress = -1; static int thisRequestFinished = -1; if (replyDownloadProgress == -1) { - replyDownloadProgress = + replyDownloadProgress = QDeclarativePixmapReply::staticMetaObject.indexOfSignal("downloadProgress(qint64,qint64)"); - replyFinished = + replyFinished = QDeclarativePixmapReply::staticMetaObject.indexOfSignal("finished()"); - thisRequestProgress = + thisRequestProgress = QDeclarativeImageBase::staticMetaObject.indexOfSlot("requestProgress(qint64,qint64)"); thisRequestFinished = QDeclarativeImageBase::staticMetaObject.indexOfSlot("requestFinished()"); } - QMetaObject::connect(reply, replyFinished, this, + QMetaObject::connect(reply, replyFinished, this, thisRequestFinished, Qt::DirectConnection); - QMetaObject::connect(reply, replyDownloadProgress, this, + QMetaObject::connect(reply, replyDownloadProgress, this, thisRequestProgress, Qt::DirectConnection); } else { //### should be unified with requestFinished @@ -219,7 +219,6 @@ void QDeclarativeImageBase::componentComplete() void QDeclarativeImageBase::pixmapChange() { - emit pixmapChanged(); } QT_END_NAMESPACE |