Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736

2 files changed, 7 insertions, 7 deletions

diff --git a/examples/quick/localstorage/localstorage/Header.qml b/examples/quick/localstorage/localstorage/Header.qml
index b3807f6e40..e9446de55e 100644
--- a/examples/quick/localstorage/localstorage/Header.qml
+++ b/examples/quick/localstorage/localstorage/Header.qml
@@ -186,11 +186,11 @@ Item {
                     }
                 }
             }
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: dateInput.forceActiveFocus()
-            }
         }
     }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: dateInput.forceActiveFocus()
+    }
 }
diff --git a/examples/quick/localstorage/localstorage/localstorage.qml b/examples/quick/localstorage/localstorage/localstorage.qml
index 434639db54..41f5cbd561 100644
--- a/examples/quick/localstorage/localstorage/localstorage.qml
+++ b/examples/quick/localstorage/localstorage/localstorage.qml
@@ -166,8 +166,8 @@ Window {
             Component {
                 id: highlightBar
                 Rectangle {
-                    width: listView.currentItem.width
-                    height: listView.currentItem.height
+                    width: listView.currentItem !== null ? listView.currentItem.width : implicitWidth
+                    height: listView.currentItem !== null ? listView.currentItem.height : implicitHeight
                     color: "lightgreen"
                 }
             }