diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:10 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:11 +0200 |
| commit | 464a43d43c2bb2440d4ad745bc134e0dac10872c (patch) | |
| tree | b1c27b1d1c11f9c43bd2e62e1fd955bc6f89029f /src/plugins/platformthemes/gtk3/qgtk3menu.h | |
| parent | 0208cac94fbd79fc563c903e2b973d79f9644b82 (diff) | |
| parent | 877ef0594d94f48bf063446b1f8a4b5e1941a8cd (diff) | |
Merge 5.9 into 5.9.0v5.9.0-beta4
Change-Id: Id3fc911f024cba292a5c426b36aa94ff9f3c0ef7
Diffstat (limited to 'src/plugins/platformthemes/gtk3/qgtk3menu.h')
| -rw-r--r-- | src/plugins/platformthemes/gtk3/qgtk3menu.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platformthemes/gtk3/qgtk3menu.h b/src/plugins/platformthemes/gtk3/qgtk3menu.h index b43f363fa4..c4dd89cefc 100644 --- a/src/plugins/platformthemes/gtk3/qgtk3menu.h +++ b/src/plugins/platformthemes/gtk3/qgtk3menu.h @@ -82,8 +82,10 @@ public: bool isChecked() const; void setChecked(bool checked) override; +#if QT_CONFIG(shortcut) QKeySequence shortcut() const; void setShortcut(const QKeySequence &shortcut) override; +#endif bool isEnabled() const; void setEnabled(bool enabled) override; @@ -114,7 +116,9 @@ private: QGtk3Menu *m_menu; GtkWidget *m_item; QString m_text; +#if QT_CONFIG(shortcut) QKeySequence m_shortcut; +#endif }; class QGtk3Menu : public QPlatformMenu |