Support painting QMenuBar items with both icon and text

Currently, QMenuBar items are painted with either icon or text, depending on whether or not the action or menu in the menubar has an icon. If the action or menu has an icon, then only the icon is painted. If the action or menu does not have an icon, then its text, if any, is painted.

However, it would be nice if QMenuBar items were painted with both icon and text, if the action or menu has both. Otherwise, use whichever property is set. This behavior is supported by the fact that QMenuBar has an addMenu() function which takes both QIcon and QString as arguments.