diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-25 12:27:20 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-25 12:14:06 +0000 |
| commit | 68abe8164943e50f3bac4260a6985c795f5abe3e (patch) | |
| tree | b9d19329ddac05a44c1c5119958b08c474848d16 /src/controls/qquickmenubar.cpp | |
| parent | 1d61e0052b6a94546f264c3a37a19db09003d7c8 (diff) | |
| download | qtquickcontrols-68abe8164943e50f3bac4260a6985c795f5abe3e.tar.gz | |
Disable platform menus on XCB
Context menus and combobox popups no longer work with QDBusPlatformMenu,
which only works in the global menubar or system tray icon.
Change-Id: I65d037c8eb9e8f0f462ddc2dfb36843c062714b3
Task-number: QTBUG-51372
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/controls/qquickmenubar.cpp')
| -rw-r--r-- | src/controls/qquickmenubar.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/controls/qquickmenubar.cpp b/src/controls/qquickmenubar.cpp index d1378773..60673366 100644 --- a/src/controls/qquickmenubar.cpp +++ b/src/controls/qquickmenubar.cpp @@ -99,6 +99,10 @@ void QQuickMenuBar1::setNative(bool native) void QQuickMenuBar1::setNativeNoNotify(bool native) { + // QTBUG-51372 + if (QGuiApplication::platformName() == QStringLiteral("xcb")) + return; + if (native) { if (!m_platformMenuBar) { m_platformMenuBar = QGuiApplicationPrivate::platformTheme()->createPlatformMenuBar(); |