diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-01-07 00:51:34 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-01-07 00:51:34 (GMT) |
| commit | 5b67b61150771cf978648a35db201345d6fb37ae (patch) | |
| tree | c8927dd65b3d1edeff76fd21ac0c49b7ace72bf6 /src/svg/qsvgfont_p.h | |
| parent | c527a1ee371c4758776217e7d16c75e20fe6f5aa (diff) | |
| parent | 9cc21c043238dc7576a465c9d236e8968fd8c549 (diff) | |
| download | Qt-5b67b61150771cf978648a35db201345d6fb37ae.zip Qt-5b67b61150771cf978648a35db201345d6fb37ae.tar.gz Qt-5b67b61150771cf978648a35db201345d6fb37ae.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
Diffstat (limited to 'src/svg/qsvgfont_p.h')
0 files changed, 0 insertions, 0 deletions