Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 22 Mar 2011 17:15:21 +0000 (18:15 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 22 Mar 2011 17:15:21 +0000 (18:15 +0100)
commita5c3c11e3e2204da6c8be9af98b38929366fafb8
treee4aa81a4cd1783875b3f77fb75afb6c151801365
parentb268977478477952a5067ca6389b73d00d1807d2
parent265074001db00920abbb0defba69743ef71c4cc0
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
src/declarative/graphicsitems/qdeclarativetext.cpp
tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp