diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-09 01:47:04 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-09 01:47:04 (GMT) |
commit | 9a32c5940f259f101f13b91dcb95d9861fb9043d (patch) | |
tree | af73f5081e20002fab7319a05ce5bccf48e6c302 /src/declarative/graphicsitems/qdeclarativeimagebase.cpp | |
parent | 2580b9b646586de0844d120d41f7240d75bc1a07 (diff) | |
parent | 147b11193618c954f41625b469a113f202362468 (diff) | |
download | Qt-9a32c5940f259f101f13b91dcb95d9861fb9043d.zip Qt-9a32c5940f259f101f13b91dcb95d9861fb9043d.tar.gz Qt-9a32c5940f259f101f13b91dcb95d9861fb9043d.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Move pixmapChanged signal to QDeclarativeImage
Minor cleanup.
Add highlightRangeMode and snapMode to GridView.
Minor anchors.fill optimization.
Use one thread for all instances.
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 0e9638d..e65c9d1 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 |