diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-30 01:02:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-30 01:02:41 (GMT) |
| commit | 81b73d11e3d147f97d20af220721617bcf3c412f (patch) | |
| tree | df276c607e34a8e6c6146fc21b05762788ebe35d /src/declarative/graphicsitems/qdeclarativetextedit.cpp | |
| parent | 2a2d872a57d8cd913775af66f56a0250c157ee16 (diff) | |
| parent | 130cf33cdc1a1f7c2a0b33fcef0ac63b8163306d (diff) | |
| download | Qt-81b73d11e3d147f97d20af220721617bcf3c412f.zip Qt-81b73d11e3d147f97d20af220721617bcf3c412f.tar.gz Qt-81b73d11e3d147f97d20af220721617bcf3c412f.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:
Some tweaks on the QML-enhanced QtDemo
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit.cpp')
0 files changed, 0 insertions, 0 deletions