Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
authorThiago Macieira <thiago.macieira@nokia.com>
Fri, 11 Mar 2011 14:05:02 +0000 (15:05 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Fri, 11 Mar 2011 14:05:02 +0000 (15:05 +0100)
commit5662cda2d836f448d036ed516d0b9a2795f6905c
tree5de0ec34ddec6c342a5189386460be3128967746
parent2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398
parent7e3efb88e7781294408d94ad703eea60d21ff7be
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
src/gui/widgets/qlinecontrol.cpp