diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-28 12:18:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-28 12:18:11 +0200 |
| commit | e52eb747b1d1c3026fed39e833c0c7365a8d5117 (patch) | |
| tree | 0dad16b7379751c9cb43aa700b471de76fe6424d /src/platformsupport/themes/genericunix | |
| parent | a6bbaa08bfb37a77afa9ee8077cd51f74dd9ee9c (diff) | |
| parent | 781b5a6198aef300bb8f1fdc6681d4756001d3b4 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I4788bc037c55c48563ffd4ba9633a22aa1d12f22
Diffstat (limited to 'src/platformsupport/themes/genericunix')
| -rw-r--r-- | src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp index fb0705c8c7..b13c875854 100644 --- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp @@ -120,7 +120,7 @@ void QDBusMenuBar::syncMenu(QPlatformMenu *menu) void QDBusMenuBar::handleReparent(QWindow *newParentWindow) { - if (newParentWindow && newParentWindow->winId() != m_windowId) { + if (newParentWindow) { unregisterMenuBar(); m_windowId = newParentWindow->winId(); registerMenuBar(); |