Merge remote branch 'kde-qt/patches/0180-window-role' into 4.6.3-patched
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 6 Jul 2010 10:28:20 +0000 (12:28 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 6 Jul 2010 10:28:20 +0000 (12:28 +0200)
commita8da9ff28e1890950e81fd9c753bffdb90955d2a
tree4e2217b154d38876ef2fc022d61411bd0cc7a23c
parent76353f177cd84327c692ea31ec644df683643194
parentc119289d63c7357c515c9ecf8f79393c806364b2
Merge remote branch 'kde-qt/patches/0180-window-role' into 4.6.3-patched
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject_p.h
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_x11.cpp