diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-02-04 16:51:29 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-05 15:03:34 +0100 |
commit | 2f2107c1ba8134026e4aa98d5c7c072c9ce81c19 (patch) | |
tree | 1226b5601465fb75b9d70dea52ba0cd2366b66bf | |
parent | 5809471ac7dd7bba7f434fc6ed779abd78518360 (diff) |
Add enablers for Android port in QPlatformMenu
We need a couple of functions here for the Android support.
Change-Id: I50e27277d7e838e277d616dbd3af9be817fb7197
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-rw-r--r-- | src/gui/kernel/qplatformmenu.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenu.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenuitem.h | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformmenu.h b/src/gui/kernel/qplatformmenu.h index e291bfb2ac..3485cc58dd 100644 --- a/src/gui/kernel/qplatformmenu.h +++ b/src/gui/kernel/qplatformmenu.h @@ -78,6 +78,7 @@ public: virtual void setIsSeparator(bool isSeparator) = 0; virtual void setFont(const QFont &font) = 0; virtual void setRole(MenuRole role) = 0; + virtual void setCheckable(bool checkable) = 0; virtual void setChecked(bool isChecked) = 0; virtual void setShortcut(const QKeySequence& shortcut) = 0; virtual void setEnabled(bool enabled) = 0; @@ -99,6 +100,7 @@ public: virtual quintptr tag()const = 0; virtual void setText(const QString &text) = 0; + virtual void setIcon(const QIcon &icon) = 0; virtual void setEnabled(bool enabled) = 0; virtual void setVisible(bool visible) = 0; virtual void setMinimumWidth(int width) { Q_UNUSED(width); } diff --git a/src/plugins/platforms/cocoa/qcocoamenu.h b/src/plugins/platforms/cocoa/qcocoamenu.h index 9433e9f9c0..439b7f1a75 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.h +++ b/src/plugins/platforms/cocoa/qcocoamenu.h @@ -75,6 +75,8 @@ public: void syncModalState(bool modal); + virtual void setIcon(const QIcon &icon) { Q_UNUSED(icon) } + void setText(const QString &text); void setMinimumWidth(int width); void setFont(const QFont &font); diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.h b/src/plugins/platforms/cocoa/qcocoamenuitem.h index b28274bc05..0e6d17343d 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuitem.h +++ b/src/plugins/platforms/cocoa/qcocoamenuitem.h @@ -74,6 +74,7 @@ public: void setFont(const QFont &font); void setRole(MenuRole role); void setShortcut(const QKeySequence& shortcut); + void setCheckable(bool checkable) { Q_UNUSED(checkable) } void setChecked(bool isChecked); void setEnabled(bool isEnabled); |