Reverting merge request 916
authorGabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Thu, 14 Apr 2011 12:50:33 +0000 (14:50 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Tue, 10 May 2011 10:54:47 +0000 (12:54 +0200)
commit9b609e1c05ea48028497f0a4aca7dae646053635
tree1e3c7a3c8ec695ff54a717ca35d46cbc8c0c1444
parentd9cc2f8ff2d46cb6d69dcffb189845796ba1a17e
Reverting merge request 916

Revert "Build fix on QMenuBar"

This reverts commit ea585d567bf0970c57e31846da044295d80774ba.
(cherry picked from commit 68542b72f53f52df43063677e24994463872e81b)
src/gui/widgets/qmenubar.cpp
src/gui/widgets/qmenubarimpl.cpp