Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
authorSimon Hausmann <simon.hausmann@nokia.com>
Fri, 18 Sep 2009 13:08:00 +0000 (15:08 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Fri, 18 Sep 2009 13:08:00 +0000 (15:08 +0200)
commitb9b8a1cb6bc5a1b93373a7a634a23dcd785b3c31
tree82358a4423e481118be7e01cd40a20920ba7d8c4
parent169099b5e9c77c6633deb3c7bb949800a5f80ec2
parentfaec535829a0e454a6784b0c5c37cb63e7da8f73
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
src/gui/widgets/qmenu.cpp
src/gui/widgets/qmenu_mac.mm