diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-07-01 07:00:13 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-07-01 07:00:13 (GMT) |
| commit | 3dc0c38389670d6adddd972c532af98dd6b5deb5 (patch) | |
| tree | 779945938b51cc6290bc6dcee1cb34f696f42242 /src/declarative/graphicsitems/qdeclarativetext_p_p.h | |
| parent | 73f0d9534b593c65e4facf9a975e2c2e63608f03 (diff) | |
| parent | f5feea56fc7202ab64a1b9c5f9b05391c2b88238 (diff) | |
| download | Qt-3dc0c38389670d6adddd972c532af98dd6b5deb5.zip Qt-3dc0c38389670d6adddd972c532af98dd6b5deb5.tar.gz Qt-3dc0c38389670d6adddd972c532af98dd6b5deb5.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/s60installs/s60installs.pro
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetext_p_p.h')
0 files changed, 0 insertions, 0 deletions