From aba6546f9b25d459205ebfa4f191300a08a34eee Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@digia.com>
Date: Mon, 23 Sep 2013 14:00:28 +0200
Subject: [PATCH] Fix MenuBar related runtime warnings in ApplicationWindow

TypeError: Cannot read property '__contentItem' of null

Change-Id: I0eaf8b9779357e4314ed94335e017e32377195de
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
---
 src/controls/ApplicationWindow.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml
index dbbfbdaad..5df7286b9 100644
--- a/src/controls/ApplicationWindow.qml
+++ b/src/controls/ApplicationWindow.qml
@@ -133,7 +133,7 @@ Window {
         id: backgroundItem
         anchors.fill: parent
 
-        Keys.forwardTo: [menuBar.__contentItem]
+        Keys.forwardTo: menuBar ? [menuBar.__contentItem] : []
 
         Item {
             id: contentArea
-- 
GitLab