Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: I23c874c5dcd0452142c3cf8abff65415ad31a1e7

2 files changed, 8 insertions, 0 deletions

diff --git a/examples/location/mapviewer/mapviewer.qml b/examples/location/mapviewer/mapviewer.qml
index 2cb4e0d0..929ea4ba 100644
--- a/examples/location/mapviewer/mapviewer.qml
+++ b/examples/location/mapviewer/mapviewer.qml
@@ -231,6 +231,12 @@ ApplicationWindow {
                 stackView.currentItem.selectLanguage.connect(setLanguage)
                 stackView.currentItem.closeForm.connect(stackView.closeForm)
                 break
+            case "Clear":
+                map.clearData()
+                break
+            case "Prefetch":
+                map.prefetchData()
+                break
             default:
                 console.log("Unsupported operation")
             }
diff --git a/examples/location/mapviewer/menus/MainMenu.qml b/examples/location/mapviewer/menus/MainMenu.qml
index 3dc3e9fb..7054c40d 100644
--- a/examples/location/mapviewer/menus/MainMenu.qml
+++ b/examples/location/mapviewer/menus/MainMenu.qml
@@ -125,6 +125,8 @@ MenuBar {
             item.triggered.connect(function() {toggleMapState("FollowMe")})
 
             addItem(qsTr("Language")).triggered.connect(function(){selectTool("Language")})
+            addItem(qsTr("Prefetch Map Data")).triggered.connect(function(){selectTool("Prefetch")})
+            addItem(qsTr("Clear Map Data")).triggered.connect(function(){selectTool("Clear")})
         }
     }
 }