diff options
author | Dmitry Shachnev <mitya57@gmail.com> | 2016-01-15 17:04:01 +0300 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@theqtcompany.com> | 2016-02-23 20:56:07 +0000 |
commit | b6a824d0a3b4fabd9c22fe4c954d50e8755fb509 (patch) | |
tree | 3d37a77576234e54ffc173df7bcf4e78b2f48112 /src/platformsupport/themes/genericunix/qgenericunixthemes_p.h | |
parent | 950bb7185c320ca9fe776bf0dc2a9589bf193a0d (diff) |
Add native support for D-Bus global menu
The protocol was originally developed by Canonical, currently supported
by Unity and Plasma.
Adjust some tests to use the non-native menu bar when they require it.
[ChangeLog][XCB / X11] QMenuBar uses the unified D-Bus AppMenu menubar
when the desktop environment supports it.
Change-Id: Iea74b40522573bcc4f70168fe7fa2a49b4f3fc21
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
Diffstat (limited to 'src/platformsupport/themes/genericunix/qgenericunixthemes_p.h')
-rw-r--r-- | src/platformsupport/themes/genericunix/qgenericunixthemes_p.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h index 2d46a4d95e..b7e0d53d6f 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h @@ -85,6 +85,10 @@ public: QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE; static QStringList xdgIconThemePaths(); +#ifndef QT_NO_DBUS + QPlatformMenu *createPlatformMenu() const Q_DECL_OVERRIDE; + QPlatformMenuBar *createPlatformMenuBar() const Q_DECL_OVERRIDE; +#endif #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE; #endif @@ -107,6 +111,10 @@ public: const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE; const QFont *font(Font type) const Q_DECL_OVERRIDE; +#ifndef QT_NO_DBUS + QPlatformMenu *createPlatformMenu() const Q_DECL_OVERRIDE; + QPlatformMenuBar *createPlatformMenuBar() const Q_DECL_OVERRIDE; +#endif #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE; #endif @@ -127,6 +135,10 @@ public: QString standardButtonText(int button) const Q_DECL_OVERRIDE; virtual QString gtkFontName() const; +#ifndef QT_NO_DBUS + QPlatformMenu *createPlatformMenu() const Q_DECL_OVERRIDE; + QPlatformMenuBar *createPlatformMenuBar() const Q_DECL_OVERRIDE; +#endif #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE; #endif |