diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-03 20:12:58 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-03 20:12:58 (GMT) |
commit | f67f6bc8bcb2092da77905aa67942f59cd49470b (patch) | |
tree | a2add1b11025e2fd43aabe30da9d75948780ce51 /src/declarative/graphicsitems/qdeclarativetextinput_p_p.h | |
parent | c0b1153b2fef7aa203ec5894fde616802f3c4725 (diff) | |
parent | e97d3f3f571e3cc5f5851ea2e131ac92212802dd (diff) | |
download | Qt-f67f6bc8bcb2092da77905aa67942f59cd49470b.zip Qt-f67f6bc8bcb2092da77905aa67942f59cd49470b.tar.gz Qt-f67f6bc8bcb2092da77905aa67942f59cd49470b.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QtDBus: add support for QVariantHash out of the box
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextinput_p_p.h')
0 files changed, 0 insertions, 0 deletions