Merge remote branch 'kde-qt/patches/0180-window-role' into 4.7-stable-pached
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 30 Nov 2010 20:13:22 +0000 (21:13 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 30 Nov 2010 20:13:22 +0000 (21:13 +0100)
commitc7006a261075b773b1d81cc8d119ade35567af42
tree539590e878f7145e7ef546452f36855c94b4746a
parentcaca740ea1219227008c303b5f2fac24af5a62a0
parentc119289d63c7357c515c9ecf8f79393c806364b2
Merge remote branch 'kde-qt/patches/0180-window-role' into 4.7-stable-pached

Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject_p.h
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_x11.cpp