Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 9 Jul 2011 16:05:49 +0000 (02:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 9 Jul 2011 16:05:49 +0000 (02:05 +1000)
commitab620c451c30e05e8667ed9c8ec813c99738253d
treefe2718a9a071eae42923d035f7f156e75eb65494
parent3b7b6b5192e943f13629b1790613ee8ae263eba3
parent88b541095e2c818387996cac3590a612589b1253
Merge branch 4.7 into qt-4.8-from-4.7