summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>2013-11-12 15:29:17 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-15 16:34:39 +0100
commit7cc1656fef21e6bdc044968a79f0a41155357c29 (patch)
treec54d9c7b9c8920c870a21b88509f91f29eaae990
parent29d1b0d209ebb267c5a6ac8402c33892c09b8de6 (diff)
downloadqtquickcontrols-7cc1656fef21e6bdc044968a79f0a41155357c29.tar.gz
Make sure menu bar has a parent window
On Android we depend on the parent window of the menu bar to know when to show which menu bar. The menu bar parent was set in the onVisibleChanged signal of the background item, but this visible property is never changed. Adding a signal handler for the visible property of the window as well fixes the issue. Task-number: QTBUG-34681 Change-Id: I2cbafabe165420fd1697fbe51a8f393eb5158ffd Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-rw-r--r--src/controls/ApplicationWindow.qml2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml
index d5049f8d..3d3f8840 100644
--- a/src/controls/ApplicationWindow.qml
+++ b/src/controls/ApplicationWindow.qml
@@ -119,6 +119,8 @@ Window {
onStatusBarChanged: { if (statusBar) { statusBar.parent = statusBarArea } }
+ onVisibleChanged: { if (visible && menuBar) { menuBar.__parentWindow = root } }
+
/*! \internal */
default property alias data: contentArea.data