Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
authorAlan Alpert <alan.alpert@nokia.com>
Thu, 14 Jan 2010 11:18:28 +0000 (12:18 +0100)
committerAlan Alpert <alan.alpert@nokia.com>
Thu, 14 Jan 2010 11:18:28 +0000 (12:18 +0100)
commit2ac0b4390164e7d92b53b0b0f55a82a9a054ee91
treec57977b39f0a27961d1c9307f1a8bda40eb49695
parenta299057a351b0aff2c961e920839451b67e50f4e
parent9baeb2fc297a7a30bb467ea0d1986c7fecea2e58
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
src/gui/widgets/qlinecontrol.cpp