diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-16 02:09:27 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-16 02:09:27 (GMT) |
| commit | dd703f7a7e676f26dcb3ad634d75e0c9f677db43 (patch) | |
| tree | f29f903c584349fe7ef67d43613f9fddaeb85aba /src/gui/graphicsview/qgraphicsitemanimation.h | |
| parent | 081fafe395d52ae42b57c36d1279e6ac05ae2cde (diff) | |
| parent | e56c5483fe8b292545bb9f004d796abd8ae00589 (diff) | |
| download | Qt-dd703f7a7e676f26dcb3ad634d75e0c9f677db43.zip Qt-dd703f7a7e676f26dcb3ad634d75e0c9f677db43.tar.gz Qt-dd703f7a7e676f26dcb3ad634d75e0c9f677db43.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
src/declarative/qml/qdeclarativeengine.cpp
tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitemanimation.h')
0 files changed, 0 insertions, 0 deletions