diff options
author | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-17 07:06:14 (GMT) |
---|---|---|
committer | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-17 07:06:14 (GMT) |
commit | a4b37abd96860a5bc46f88205bb11706cbaec228 (patch) | |
tree | 7181b9757b6f6083477cd9b3966b0b9f9163a77c /src/declarative/graphicsitems/qdeclarativetext.cpp | |
parent | 13ea38369b7f095e6af96c98bed7a3bb9bf795d5 (diff) | |
parent | 57676c237992e0aa5a93a4e8fa66b3e7b90c2c90 (diff) | |
download | Qt-a4b37abd96860a5bc46f88205bb11706cbaec228.zip Qt-a4b37abd96860a5bc46f88205bb11706cbaec228.tar.gz Qt-a4b37abd96860a5bc46f88205bb11706cbaec228.tar.bz2 |
Merge branch '4.7' into qtquick11
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetext.cpp')
0 files changed, 0 insertions, 0 deletions