diff options
author | James Turner <james.turner@kdab.com> | 2012-06-26 14:43:20 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-27 00:46:35 +0200 |
commit | 9315497d2af6d6944792bbbffd61582c7061ef4c (patch) | |
tree | db149894c41bf3f0e3c692348fdba7577ccc48ff /src/gui/kernel | |
parent | c0a0b3710302dc7711c4296c35df8ccf6b91f572 (diff) |
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>
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qplatformmenu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qplatformmenu.h b/src/gui/kernel/qplatformmenu.h index 298dd5dd68..b4f4fc8a5d 100644 --- a/src/gui/kernel/qplatformmenu.h +++ b/src/gui/kernel/qplatformmenu.h @@ -55,6 +55,7 @@ #include <QtCore/qpointer.h> #include <QtGui/QFont> #include <QtGui/QKeySequence> +#include <QtGui/QIcon> QT_BEGIN_HEADER @@ -73,7 +74,7 @@ public: virtual quintptr tag()const = 0; virtual void setText(const QString &text) = 0; - virtual void setIcon(const QImage &icon) = 0; + virtual void setIcon(const QIcon &icon) = 0; virtual void setMenu(QPlatformMenu *menu) = 0; virtual void setVisible(bool isVisible) = 0; virtual void setIsSeparator(bool isSeparator) = 0; |