Convert QPA menus to use QIcon, and enable icons.
authorJames Turner <james.turner@kdab.com>
Tue, 26 Jun 2012 13:43:20 +0000 (14:43 +0100)
committerQt by Nokia <qt-info@nokia.com>
Tue, 26 Jun 2012 22:46:35 +0000 (00:46 +0200)
commit9315497d2af6d6944792bbbffd61582c7061ef4c
treedb149894c41bf3f0e3c692348fdba7577ccc48ff
parentc0a0b3710302dc7711c4296c35df8ccf6b91f572
Convert QPA menus to use QIcon, and enable icons.

Icon support was disabled in QPA menus, now QIcon is in QtGui, convert the QPA interface, enable setting the icon in QMenu, and make the Cocoa implementation use it. (And fix a ref-counting leak if an icon is actually set)

Change-Id: Ica203bf6826b79d8beee58f39febc851b9633a66
Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
src/gui/kernel/qplatformmenu.h
src/plugins/platforms/cocoa/qcocoamenuitem.h
src/plugins/platforms/cocoa/qcocoamenuitem.mm
src/widgets/widgets/qmenu.cpp