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_p.h | |
| 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_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeimagebase_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase_p.h b/src/declarative/graphicsitems/qdeclarativeimagebase_p.h index cfebdca..b215193 100644 --- a/src/declarative/graphicsitems/qdeclarativeimagebase_p.h +++ b/src/declarative/graphicsitems/qdeclarativeimagebase_p.h @@ -75,7 +75,6 @@ Q_SIGNALS: void sourceChanged(const QUrl &); void statusChanged(Status); void progressChanged(qreal progress); - void pixmapChanged(); void asynchronousChanged(); protected: |