Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 18 Jul 2011 16:05:21 +0000 (02:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 18 Jul 2011 16:05:21 +0000 (02:05 +1000)
commite1989c599e404be834a36f02c51bdd91b720ff6f
treea51656f9c64d90f3ad5109a6da8812b34f560d7c
parent88d6bf04e01f4f006ed2708851e925d59012d591
parent2dcd6bb37c90d9d0777f25d419324c3d7ec5d722
Merge branch 4.7 into qt-4.8-from-4.7
src/gui/kernel/qwidget_x11.cpp