Merge remote-tracking branch 'staging/master'
authorOlivier Goffart <olivier.goffart@nokia.com>
Tue, 10 May 2011 11:15:10 +0000 (13:15 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Tue, 10 May 2011 11:15:10 +0000 (13:15 +0200)
1  2 
src/gui/kernel/qwidget.cpp

Simple merge