Clean up files in mapviewer example.

Rename files, move the subdirectories, remove
obsolete dependencies to location examples plugin.

Conflicts:
	examples/location/mapviewer/mapviewer.pro

Change-Id: Id85dfffc32761eb9d2999b8e07b87f9912700659
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

32 files changed, 90 insertions, 86 deletions

diff --git a/examples/location/mapviewer/Geocode.qml b/examples/location/mapviewer/forms/Geocode.qml
index 55e94fc0..c1d70a45 100644
--- a/examples/location/mapviewer/Geocode.qml
+++ b/examples/location/mapviewer/forms/Geocode.qml
@@ -40,7 +40,6 @@
 
 import QtQuick 2.4
 import QtPositioning 5.2
-import "forms"
 
 //Geocode Dialog
 //! [geocode0]
diff --git a/examples/location/mapviewer/Locale.qml b/examples/location/mapviewer/forms/Locale.qml
index 14fa1b9d..ed42476d 100644
--- a/examples/location/mapviewer/Locale.qml
+++ b/examples/location/mapviewer/forms/Locale.qml
@@ -40,7 +40,6 @@
 
 import QtQuick 2.4
 import QtPositioning 5.2
-import "forms"
 
 LocaleForm {
     property string locale
diff --git a/examples/location/mapviewer/Message.qml b/examples/location/mapviewer/forms/Message.qml
index 8bf01530..e7230afb 100644
--- a/examples/location/mapviewer/Message.qml
+++ b/examples/location/mapviewer/forms/Message.qml
@@ -39,7 +39,6 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import "forms"
 
 MessageForm {
     property string title
diff --git a/examples/location/mapviewer/ReverseGeocode.qml b/examples/location/mapviewer/forms/ReverseGeocode.qml
index f5ac9a9e..53738c4d 100644
--- a/examples/location/mapviewer/ReverseGeocode.qml
+++ b/examples/location/mapviewer/forms/ReverseGeocode.qml
@@ -40,7 +40,6 @@
 
 import QtQuick 2.4
 import QtPositioning 5.2
-import "forms"
 
 //Reverse Geocode Dialog
 ReverseGeocodeForm {
diff --git a/examples/location/mapviewer/RouteAddress.qml b/examples/location/mapviewer/forms/RouteAddress.qml
index a040abc3..54c5f687 100644
--- a/examples/location/mapviewer/RouteAddress.qml
+++ b/examples/location/mapviewer/forms/RouteAddress.qml
@@ -41,7 +41,6 @@
 import QtQuick 2.4
 import QtLocation 5.3
 import QtPositioning 5.3
-import "forms"
 
 RouteAddressForm {
     property alias plugin : tempGeocodeModel.plugin;
diff --git a/examples/location/mapviewer/RouteCoordinate.qml b/examples/location/mapviewer/forms/RouteCoordinate.qml
index 40d8fd4a..9c593e0a 100644
--- a/examples/location/mapviewer/RouteCoordinate.qml
+++ b/examples/location/mapviewer/forms/RouteCoordinate.qml
@@ -40,7 +40,6 @@
 
 import QtQuick 2.4
 import QtPositioning 5.2
-import "forms"
 
 //Route Dialog
 //! [routedialog0]
diff --git a/examples/location/mapviewer/RouteList.qml b/examples/location/mapviewer/forms/RouteList.qml
index d9a26b6c..200d10dd 100644
--- a/examples/location/mapviewer/RouteList.qml
+++ b/examples/location/mapviewer/forms/RouteList.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.4
 import QtQuick.Controls 1.3
-import "helper.js" as Helper
+import "../helper.js" as Helper
 
 ListView {
     property variant routeModel
diff --git a/examples/location/mapviewer/RouteListDelegate.qml b/examples/location/mapviewer/forms/RouteListDelegate.qml
index 16dca34a..16dca34a 100644
--- a/examples/location/mapviewer/RouteListDelegate.qml
+++ b/examples/location/mapviewer/forms/RouteListDelegate.qml
diff --git a/examples/location/mapviewer/RouteListHeader.qml b/examples/location/mapviewer/forms/RouteListHeader.qml
index a907214f..a907214f 100644
--- a/examples/location/mapviewer/RouteListHeader.qml
+++ b/examples/location/mapviewer/forms/RouteListHeader.qml
diff --git a/examples/location/mapviewer/qmlmapviewerwrapper.cpp b/examples/location/mapviewer/main.cpp
index cda642ec..cda642ec 100644
--- a/examples/location/mapviewer/qmlmapviewerwrapper.cpp
+++ b/examples/location/mapviewer/main.cpp
diff --git a/examples/location/mapviewer/content/map/CircleItem.qml b/examples/location/mapviewer/map/CircleItem.qml
index cc5e6faa..cc5e6faa 100644
--- a/examples/location/mapviewer/content/map/CircleItem.qml
+++ b/examples/location/mapviewer/map/CircleItem.qml
diff --git a/examples/location/mapviewer/content/map/ImageItem.qml b/examples/location/mapviewer/map/ImageItem.qml
index c5a554b0..9b213406 100644
--- a/examples/location/mapviewer/content/map/ImageItem.qml
+++ b/examples/location/mapviewer/map/ImageItem.qml
@@ -55,7 +55,7 @@ MapQuickItem {  //to be used inside MapComponent only
 
     sourceItem: Image {
         id: testImage
-        source: "../../icon.png"
+        source: "../resources/icon.png"
         opacity: 0.7
     }
 }
diff --git a/examples/location/mapviewer/content/map/MapComponent.qml b/examples/location/mapviewer/map/MapComponent.qml
index eea6b86f..c6855864 100644
--- a/examples/location/mapviewer/content/map/MapComponent.qml
+++ b/examples/location/mapviewer/map/MapComponent.qml
@@ -41,7 +41,7 @@ import QtQuick 2.4
 import QtQuick.Controls 1.3
 import QtLocation 5.3
 import QtPositioning 5.2
-import "../../helper.js" as Helper
+import "../helper.js" as Helper
 
 //! [top]
 Map {
@@ -495,19 +495,19 @@ Map {
         }
         Image {
             id: scaleImageLeft
-            source: "../../resources/scale_end.png"
+            source: "../resources/scale_end.png"
             anchors.bottom: parent.bottom
             anchors.left: parent.left
         }
         Image {
             id: scaleImage
-            source: "../../resources/scale.png"
+            source: "../resources/scale.png"
             anchors.bottom: parent.bottom
             anchors.left: scaleImageLeft.right
         }
         Image {
             id: scaleImageRight
-            source: "../../resources/scale_end.png"
+            source: "../resources/scale_end.png"
             anchors.bottom: parent.bottom
             anchors.left: scaleImage.right
         }
diff --git a/examples/location/mapviewer/content/map/Marker.qml b/examples/location/mapviewer/map/Marker.qml
index 730b62f1..192fdd80 100644
--- a/examples/location/mapviewer/content/map/Marker.qml
+++ b/examples/location/mapviewer/map/Marker.qml
@@ -40,7 +40,6 @@
 
 import QtQuick 2.0;
 import QtLocation 5.3
-import QtLocation.examples 5.0
 
 //! [mqi-top]
 MapQuickItem {
@@ -56,7 +55,7 @@ MapQuickItem {
     sourceItem: Image {
         id: image
 //! [mqi-anchor]
-        source: markerMouseArea.containsMouse ? (markerMouseArea.pressed  ? "../../resources/marker_selected.png" :"../../resources/marker_hovered.png") : "../../resources/marker.png"
+        source: markerMouseArea.containsMouse ? (markerMouseArea.pressed  ? "../resources/marker_selected.png" :"../resources/marker_hovered.png") : "../resources/marker.png"
         MouseArea  {
             id: markerMouseArea
             property int pressX : -1
diff --git a/examples/location/mapviewer/content/map/MiniMap.qml b/examples/location/mapviewer/map/MiniMap.qml
index fbd000ef..fbd000ef 100644
--- a/examples/location/mapviewer/content/map/MiniMap.qml
+++ b/examples/location/mapviewer/map/MiniMap.qml
diff --git a/examples/location/mapviewer/content/map/PolygonItem.qml b/examples/location/mapviewer/map/PolygonItem.qml
index 0d72f9d7..0d72f9d7 100644
--- a/examples/location/mapviewer/content/map/PolygonItem.qml
+++ b/examples/location/mapviewer/map/PolygonItem.qml
diff --git a/examples/location/mapviewer/content/map/PolylineItem.qml b/examples/location/mapviewer/map/PolylineItem.qml
index efb05d39..efb05d39 100644
--- a/examples/location/mapviewer/content/map/PolylineItem.qml
+++ b/examples/location/mapviewer/map/PolylineItem.qml
diff --git a/examples/location/mapviewer/content/map/RectangleItem.qml b/examples/location/mapviewer/map/RectangleItem.qml
index 21a60e98..21a60e98 100644
--- a/examples/location/mapviewer/content/map/RectangleItem.qml
+++ b/examples/location/mapviewer/map/RectangleItem.qml
diff --git a/examples/location/mapviewer/mapviewer.pro b/examples/location/mapviewer/mapviewer.pro
index 4ab8c30d..51a271dc 100644
--- a/examples/location/mapviewer/mapviewer.pro
+++ b/examples/location/mapviewer/mapviewer.pro
@@ -2,34 +2,39 @@ TARGET = qml_location_mapviewer
 TEMPLATE = app
 
 QT += qml network quick positioning location
-SOURCES += qmlmapviewerwrapper.cpp
+SOURCES += main.cpp
 
 RESOURCES += \
-    mapviewerwrapper.qrc
-
-qmlcontent.files += \
-    mapviewer.qml
-
-OTHER_FILES += $$qmlcontent.files
-
-qmlcontentmap.files += \
-    content/map/MapComponent.qml \
-    content/map/Marker.qml \
-    content/map/CircleItem.qml \
-    content/map/RectangleItem.qml \
-    content/map/PolylineItem.qml \
-    content/map/PolygonItem.qml \
-    content/map/ImageItem.qml \
-    content/map/MiniMap.qml
-OTHER_FILES += $$qmlcontentmap.files
-
-qmlcontentdialogs.files += \
-    content/dialogs/RouteDialog.qml
-OTHER_FILES += $$qmlcontentdialogs.files
-
-include(../common/common.pri)
+    mapviewer.qrc
+
+OTHER_FILES +=mapviewer.qml \
+    map/MapComponent.qml \
+    map/Marker.qml \
+    map/CircleItem.qml \
+    map/RectangleItem.qml \
+    map/PolylineItem.qml \
+    map/PolygonItem.qml \
+    map/ImageItem.qml \
+    map/MiniMap.qml \
+    menus/ItemPopupMenu.qml \
+    menus/MainMenu.qml \
+    menus/MapPopupMenu.qml \
+    menus/MarkerPopupMenu \
+    forms/Geocode.qml \
+    forms/GeocodeForm.ui.qml\
+    forms/Message.qml \
+    forms/MessageForm.ui.qml \
+    forms/ReverseGeocode.qml \
+    forms/ReverseGeocodeForm.ui.qml \
+    forms/RouteCoordinate.qml \
+    forms/Locale.qml \
+    forms/LocaleForm.ui.qml \
+    forms/RouteAddress.qml \
+    forms/RouteAddressForm.ui.qml \
+    forms/RouteCoordinateForm.ui.qml \
+    forms/RouteList.qml \
+    forms/RouteListDelegate.qml \
+    forms/RouteListHeader.qml
 
 target.path = $$[QT_INSTALL_EXAMPLES]/location/mapviewer
-additional.files = ../common
-additional.path = $$[QT_INSTALL_EXAMPLES]/location/common
-INSTALLS += target additional
+INSTALLS += target
diff --git a/examples/location/mapviewer/mapviewer.qml b/examples/location/mapviewer/mapviewer.qml
index 338c717a..d15058ba 100644
--- a/examples/location/mapviewer/mapviewer.qml
+++ b/examples/location/mapviewer/mapviewer.qml
@@ -42,7 +42,8 @@ import QtQuick 2.4
 import QtQuick.Controls 1.3
 import QtLocation 5.3
 import QtPositioning 5.2
-import "content/map"
+import "map"
+import "menus"
 import "helper.js" as Helper
 
 ApplicationWindow {
@@ -70,7 +71,7 @@ ApplicationWindow {
         }
 
         map = Qt.createQmlObject ('import QtLocation 5.3;\
-                                       import "content/map";\
+                                       import "map";\
                                        import "helper.js" as Helper;\
                                        MapComponent{\
                                            width: page.width;\
@@ -193,7 +194,7 @@ ApplicationWindow {
                 minimap.destroy()
                 minimap = null
             } else {
-                minimap = Qt.createQmlObject ('import "content/map"; MiniMap{ z: map.z + 2 }', map)
+                minimap = Qt.createQmlObject ('import "map"; MiniMap{ z: map.z + 2 }', map)
             }
         }
 
@@ -272,7 +273,7 @@ ApplicationWindow {
         onSelectTool: {
             switch (tool) {
             case "AddressRoute":
-                stackView.push({ item: Qt.resolvedUrl("RouteAddress.qml") ,
+                stackView.push({ item: Qt.resolvedUrl("forms/RouteAddress.qml") ,
                                    properties: { "plugin": map.plugin,
                                        "toAddress": toAddress,
                                        "fromAddress": fromAddress}})
@@ -281,26 +282,26 @@ ApplicationWindow {
                 stackView.currentItem.closeForm.connect(stackView.closeForm)
                 break
             case "CoordinateRoute":
-                stackView.push({ item: Qt.resolvedUrl("RouteCoordinate.qml") ,
+                stackView.push({ item: Qt.resolvedUrl("forms/RouteCoordinate.qml") ,
                                    properties: { "toCoordinate": toCoordinate,
                                        "fromCoordinate": fromCoordinate}})
                 stackView.currentItem.showRoute.connect(showRoute)
                 stackView.currentItem.closeForm.connect(stackView.closeForm)
                 break
             case "Geocode":
-                stackView.push({ item: Qt.resolvedUrl("Geocode.qml") ,
+                stackView.push({ item: Qt.resolvedUrl("forms/Geocode.qml") ,
                                    properties: { "address": fromAddress}})
                 stackView.currentItem.showPlace.connect(showPlace)
                 stackView.currentItem.closeForm.connect(stackView.closeForm)
                 break
             case "RevGeocode":
-                stackView.push({ item: Qt.resolvedUrl("ReverseGeocode.qml") ,
+                stackView.push({ item: Qt.resolvedUrl("forms/ReverseGeocode.qml") ,
                                    properties: { "coordinate": fromCoordinate}})
                 stackView.currentItem.showPlace.connect(showPlace)
                 stackView.currentItem.closeForm.connect(stackView.closeForm)
                 break
             case "Language":
-                stackView.push({ item: Qt.resolvedUrl("Locale.qml") ,
+                stackView.push({ item: Qt.resolvedUrl("forms/Locale.qml") ,
                                    properties: { "locale":  map.plugin.locales[0]}})
                 stackView.currentItem.selectLanguage.connect(setLanguage)
                 stackView.currentItem.closeForm.connect(stackView.closeForm)
@@ -376,7 +377,7 @@ ApplicationWindow {
 
         function askForCoordinate()
         {
-            stackView.push({ item: Qt.resolvedUrl("ReverseGeocode.qml") ,
+            stackView.push({ item: Qt.resolvedUrl("forms/ReverseGeocode.qml") ,
                                properties: { "title": qsTr("New Coordinate"),
                                    "coordinate":   map.markers[map.currentMarker].coordinate}})
             stackView.currentItem.showPlace.connect(moveMarker)
@@ -475,7 +476,7 @@ ApplicationWindow {
 
         function showMessage(title,message,backPage)
         {
-            push({ item: Qt.resolvedUrl("Message.qml") ,
+            push({ item: Qt.resolvedUrl("forms/Message.qml") ,
                                properties: {
                                    "title" : title,
                                    "message" : message,
@@ -496,7 +497,7 @@ ApplicationWindow {
 
         function showRouteListPage()
         {
-            push({ item: Qt.resolvedUrl("RouteList.qml") ,
+            push({ item: Qt.resolvedUrl("forms/RouteList.qml") ,
                                properties: {
                                    "routeModel" : map.routeModel
                                }})
diff --git a/examples/location/mapviewer/mapviewer.qrc b/examples/location/mapviewer/mapviewer.qrc
new file mode 100644
index 00000000..6b888215
--- /dev/null
+++ b/examples/location/mapviewer/mapviewer.qrc
@@ -0,0 +1,39 @@
+<RCC>
+    <qresource prefix="/">
+        <file>mapviewer.qml</file>
+        <file>map/MapComponent.qml</file>
+        <file>map/Marker.qml</file>
+        <file>map/PolylineItem.qml</file>
+        <file>map/RectangleItem.qml</file>
+        <file>map/CircleItem.qml</file>
+        <file>map/PolygonItem.qml</file>
+        <file>map/ImageItem.qml</file>
+        <file>map/MiniMap.qml</file>
+        <file>forms/Message.qml</file>
+        <file>forms/MessageForm.ui.qml</file>
+        <file>forms/Geocode.qml</file>
+        <file>forms/GeocodeForm.ui.qml</file>
+        <file>forms/ReverseGeocode.qml</file>
+        <file>forms/ReverseGeocodeForm.ui.qml</file>
+        <file>forms/RouteCoordinate.qml</file>
+        <file>forms/RouteCoordinateForm.ui.qml</file>
+        <file>forms/RouteAddress.qml</file>
+        <file>forms/RouteAddressForm.ui.qml</file>
+        <file>forms/Locale.qml</file>
+        <file>forms/LocaleForm.ui.qml</file>
+        <file>forms/RouteList.qml</file>
+        <file>forms/RouteListDelegate.qml</file>
+        <file>forms/RouteListHeader.qml</file>
+        <file>menus/MainMenu.qml</file>
+        <file>menus/MapPopupMenu.qml</file>
+        <file>menus/MarkerPopupMenu.qml</file>
+        <file>menus/ItemPopupMenu.qml</file>
+        <file>helper.js</file>
+        <file>resources/scale_end.png</file>
+        <file>resources/scale.png</file>
+        <file>resources/marker.png</file>
+        <file>resources/marker_hovered.png</file>
+        <file>resources/marker_selected.png</file>
+        <file>resources/icon.png</file>
+    </qresource>
+</RCC>
diff --git a/examples/location/mapviewer/mapviewerwrapper.qrc b/examples/location/mapviewer/mapviewerwrapper.qrc
deleted file mode 100644
index dcbbbcab..00000000
--- a/examples/location/mapviewer/mapviewerwrapper.qrc
+++ /dev/null
@@ -1,34 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>mapviewer.qml</file>
-        <file>icon.png</file>
-        <file>content/map/MapComponent.qml</file>
-        <file>content/map/Marker.qml</file>
-        <file>content/map/PolylineItem.qml</file>
-        <file>content/map/RectangleItem.qml</file>
-        <file>content/map/CircleItem.qml</file>
-        <file>content/map/PolygonItem.qml</file>
-        <file>content/map/ImageItem.qml</file>
-        <file>content/map/MiniMap.qml</file>
-        <file>MainMenu.qml</file>
-        <file>forms/MessageForm.ui.qml</file>
-        <file>forms/GeocodeForm.ui.qml</file>
-        <file>forms/ReverseGeocodeForm.ui.qml</file>
-        <file>forms/RouteCoordinateForm.ui.qml</file>
-        <file>forms/RouteAddressForm.ui.qml</file>
-        <file>forms/LocaleForm.ui.qml</file>
-        <file>Message.qml</file>
-        <file>RouteCoordinate.qml</file>
-        <file>RouteAddress.qml</file>
-        <file>Geocode.qml</file>
-        <file>ReverseGeocode.qml</file>
-        <file>MapPopupMenu.qml</file>
-        <file>MarkerPopupMenu.qml</file>
-        <file>ItemPopupMenu.qml</file>
-        <file>Locale.qml</file>
-        <file>RouteList.qml</file>
-        <file>RouteListDelegate.qml</file>
-        <file>RouteListHeader.qml</file>
-        <file>helper.js</file>
-    </qresource>
-</RCC>
diff --git a/examples/location/mapviewer/ItemPopupMenu.qml b/examples/location/mapviewer/menus/ItemPopupMenu.qml
index 6b604aaa..6b604aaa 100644
--- a/examples/location/mapviewer/ItemPopupMenu.qml
+++ b/examples/location/mapviewer/menus/ItemPopupMenu.qml
diff --git a/examples/location/mapviewer/MainMenu.qml b/examples/location/mapviewer/menus/MainMenu.qml
index 31c4a53b..31c4a53b 100644
--- a/examples/location/mapviewer/MainMenu.qml
+++ b/examples/location/mapviewer/menus/MainMenu.qml
diff --git a/examples/location/mapviewer/MapPopupMenu.qml b/examples/location/mapviewer/menus/MapPopupMenu.qml
index 4bb9e0a2..4bb9e0a2 100644
--- a/examples/location/mapviewer/MapPopupMenu.qml
+++ b/examples/location/mapviewer/menus/MapPopupMenu.qml
diff --git a/examples/location/mapviewer/MarkerPopupMenu.qml b/examples/location/mapviewer/menus/MarkerPopupMenu.qml
index c5bc5740..c5bc5740 100644
--- a/examples/location/mapviewer/MarkerPopupMenu.qml
+++ b/examples/location/mapviewer/menus/MarkerPopupMenu.qml
diff --git a/examples/location/mapviewer/icon.png b/examples/location/mapviewer/resources/icon.png
index 0954baf0..0954baf0 100644
--- a/examples/location/mapviewer/icon.png
+++ b/examples/location/mapviewer/resources/icon.png
diff --git a/examples/location/mapviewer/resources/marker.png b/examples/location/mapviewer/resources/marker.png
new file mode 100644
index 00000000..86ec960e
--- /dev/null
+++ b/examples/location/mapviewer/resources/marker.png
diff --git a/examples/location/mapviewer/resources/marker_hovered.png b/examples/location/mapviewer/resources/marker_hovered.png
new file mode 100644
index 00000000..902ae591
--- /dev/null
+++ b/examples/location/mapviewer/resources/marker_hovered.png
diff --git a/examples/location/mapviewer/resources/marker_selected.png b/examples/location/mapviewer/resources/marker_selected.png
new file mode 100644
index 00000000..f4bf8921
--- /dev/null
+++ b/examples/location/mapviewer/resources/marker_selected.png
diff --git a/examples/location/mapviewer/resources/scale.png b/examples/location/mapviewer/resources/scale.png
new file mode 100644
index 00000000..6e59ff08
--- /dev/null
+++ b/examples/location/mapviewer/resources/scale.png
diff --git a/examples/location/mapviewer/resources/scale_end.png b/examples/location/mapviewer/resources/scale_end.png
new file mode 100644
index 00000000..5d3a471b
--- /dev/null
+++ b/examples/location/mapviewer/resources/scale_end.png