Merge branch 'release' into stable

Change-Id: If8a4fe6d4566ffe072c3be25f2cd5ef7a5b06d95

181 files changed, 65 insertions, 58 deletions

diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
deleted file mode 100644
index 1ed2fd7d..00000000
--- a/examples/declarative/declarative.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-
-qtHaveModule(positioning): SUBDIRS += flickr
-
-qtHaveModule(location) {
-    SUBDIRS += places places_list places_map
-    qtHaveModule(multimedia): SUBDIRS += mapviewer
-}
diff --git a/examples/declarative/places_list/places_list.pro b/examples/declarative/places_list/places_list.pro
deleted file mode 100644
index 238e2973..00000000
--- a/examples/declarative/places_list/places_list.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TARGET = places_list
-TEMPLATE = app
-
-QT += quick qml network
-SOURCES = main.cpp
-
-qmlcontent.files += $$files(*.qml)
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/places_list
-qmlcontent.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/places_list
-
-INSTALLS += target qmlcontent
diff --git a/examples/examples.pro b/examples/examples.pro
index 837e277e..da770da2 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 
-qtHaveModule(quick) {
-    SUBDIRS += declarative
-    qtHaveModule(positioning): SUBDIRS += weatherinfo
+qtHaveModule(positioning) {
+    SUBDIRS += positioning
+
+    qtHaveModule(location): SUBDIRS += location
 }
-qtHaveModule(positioning): qtHaveModule(widgets): SUBDIRS += logfilepositionsource
diff --git a/examples/declarative/common/common.pri b/examples/location/common/common.pri
index 30ede711..30ede711 100644
--- a/examples/declarative/common/common.pri
+++ b/examples/location/common/common.pri
diff --git a/examples/declarative/common/common.qrc b/examples/location/common/common.qrc
index bfd79b73..bfd79b73 100644
--- a/examples/declarative/common/common.qrc
+++ b/examples/location/common/common.qrc
diff --git a/examples/declarative/common/imports/QtLocation/examples/components/BusyIndicator.qml b/examples/location/common/imports/QtLocation/examples/components/BusyIndicator.qml
index 188b3d18..188b3d18 100644
--- a/examples/declarative/common/imports/QtLocation/examples/components/BusyIndicator.qml
+++ b/examples/location/common/imports/QtLocation/examples/components/BusyIndicator.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/components/Button.qml b/examples/location/common/imports/QtLocation/examples/components/Button.qml
index e98f8651..e98f8651 100644
--- a/examples/declarative/common/imports/QtLocation/examples/components/Button.qml
+++ b/examples/location/common/imports/QtLocation/examples/components/Button.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/components/Checkbox.qml b/examples/location/common/imports/QtLocation/examples/components/Checkbox.qml
index d0526797..d0526797 100644
--- a/examples/declarative/common/imports/QtLocation/examples/components/Checkbox.qml
+++ b/examples/location/common/imports/QtLocation/examples/components/Checkbox.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/components/Fader.qml b/examples/location/common/imports/QtLocation/examples/components/Fader.qml
index 482bc365..482bc365 100644
--- a/examples/declarative/common/imports/QtLocation/examples/components/Fader.qml
+++ b/examples/location/common/imports/QtLocation/examples/components/Fader.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/components/IconButton.qml b/examples/location/common/imports/QtLocation/examples/components/IconButton.qml
index d426203f..d426203f 100644
--- a/examples/declarative/common/imports/QtLocation/examples/components/IconButton.qml
+++ b/examples/location/common/imports/QtLocation/examples/components/IconButton.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/components/Menu.qml b/examples/location/common/imports/QtLocation/examples/components/Menu.qml
index 0fed3c4a..0fed3c4a 100644
--- a/examples/declarative/common/imports/QtLocation/examples/components/Menu.qml
+++ b/examples/location/common/imports/QtLocation/examples/components/Menu.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/components/Optionbutton.qml b/examples/location/common/imports/QtLocation/examples/components/Optionbutton.qml
index 208301da..208301da 100644
--- a/examples/declarative/common/imports/QtLocation/examples/components/Optionbutton.qml
+++ b/examples/location/common/imports/QtLocation/examples/components/Optionbutton.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/components/Slider.qml b/examples/location/common/imports/QtLocation/examples/components/Slider.qml
index 1a337425..1a337425 100644
--- a/examples/declarative/common/imports/QtLocation/examples/components/Slider.qml
+++ b/examples/location/common/imports/QtLocation/examples/components/Slider.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/components/TextWithLabel.qml b/examples/location/common/imports/QtLocation/examples/components/TextWithLabel.qml
index 7b4d9aba..7b4d9aba 100644
--- a/examples/declarative/common/imports/QtLocation/examples/components/TextWithLabel.qml
+++ b/examples/location/common/imports/QtLocation/examples/components/TextWithLabel.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/components/TitleBar.qml b/examples/location/common/imports/QtLocation/examples/components/TitleBar.qml
index 0e67fd9a..0e67fd9a 100644
--- a/examples/declarative/common/imports/QtLocation/examples/components/TitleBar.qml
+++ b/examples/location/common/imports/QtLocation/examples/components/TitleBar.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/components/style/ButtonStyle.qml b/examples/location/common/imports/QtLocation/examples/components/style/ButtonStyle.qml
index d93fee11..d93fee11 100644
--- a/examples/declarative/common/imports/QtLocation/examples/components/style/ButtonStyle.qml
+++ b/examples/location/common/imports/QtLocation/examples/components/style/ButtonStyle.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/components/style/HMenuItemStyle.qml b/examples/location/common/imports/QtLocation/examples/components/style/HMenuItemStyle.qml
index 588fdb39..588fdb39 100644
--- a/examples/declarative/common/imports/QtLocation/examples/components/style/HMenuItemStyle.qml
+++ b/examples/location/common/imports/QtLocation/examples/components/style/HMenuItemStyle.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/components/style/VMenuItemStyle.qml b/examples/location/common/imports/QtLocation/examples/components/style/VMenuItemStyle.qml
index be7c245d..be7c245d 100644
--- a/examples/declarative/common/imports/QtLocation/examples/components/style/VMenuItemStyle.qml
+++ b/examples/location/common/imports/QtLocation/examples/components/style/VMenuItemStyle.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/dialogs/Dialog.qml b/examples/location/common/imports/QtLocation/examples/dialogs/Dialog.qml
index 5ed5cfca..5ed5cfca 100644
--- a/examples/declarative/common/imports/QtLocation/examples/dialogs/Dialog.qml
+++ b/examples/location/common/imports/QtLocation/examples/dialogs/Dialog.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/dialogs/ErrorDialog.qml b/examples/location/common/imports/QtLocation/examples/dialogs/ErrorDialog.qml
index f2fc5a25..f2fc5a25 100644
--- a/examples/declarative/common/imports/QtLocation/examples/dialogs/ErrorDialog.qml
+++ b/examples/location/common/imports/QtLocation/examples/dialogs/ErrorDialog.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/dialogs/InputDialog.qml b/examples/location/common/imports/QtLocation/examples/dialogs/InputDialog.qml
index a905186e..a905186e 100644
--- a/examples/declarative/common/imports/QtLocation/examples/dialogs/InputDialog.qml
+++ b/examples/location/common/imports/QtLocation/examples/dialogs/InputDialog.qml
diff --git a/examples/declarative/common/imports/QtLocation/examples/qmldir b/examples/location/common/imports/QtLocation/examples/qmldir
index 9089f6c0..9089f6c0 100644
--- a/examples/declarative/common/imports/QtLocation/examples/qmldir
+++ b/examples/location/common/imports/QtLocation/examples/qmldir
diff --git a/examples/declarative/common/resources/busy.png b/examples/location/common/resources/busy.png
index 3cca7dab..3cca7dab 100755
--- a/examples/declarative/common/resources/busy.png
+++ b/examples/location/common/resources/busy.png
diff --git a/examples/declarative/common/resources/button.png b/examples/location/common/resources/button.png
index 1e3e752c..1e3e752c 100644
--- a/examples/declarative/common/resources/button.png
+++ b/examples/location/common/resources/button.png
diff --git a/examples/declarative/common/resources/button_pressed.png b/examples/location/common/resources/button_pressed.png
index 21d9835f..21d9835f 100644
--- a/examples/declarative/common/resources/button_pressed.png
+++ b/examples/location/common/resources/button_pressed.png
diff --git a/examples/declarative/common/resources/catch.png b/examples/location/common/resources/catch.png
index c4fbba40..c4fbba40 100644
--- a/examples/declarative/common/resources/catch.png
+++ b/examples/location/common/resources/catch.png
diff --git a/examples/declarative/common/resources/categories.png b/examples/location/common/resources/categories.png
index d1d82c2e..d1d82c2e 100644
--- a/examples/declarative/common/resources/categories.png
+++ b/examples/location/common/resources/categories.png
diff --git a/examples/declarative/common/resources/categories_pressed.png b/examples/location/common/resources/categories_pressed.png
index 965e0ad7..965e0ad7 100644
--- a/examples/declarative/common/resources/categories_pressed.png
+++ b/examples/location/common/resources/categories_pressed.png
diff --git a/examples/declarative/common/resources/checkbox.png b/examples/location/common/resources/checkbox.png
index b9aab540..b9aab540 100644
--- a/examples/declarative/common/resources/checkbox.png
+++ b/examples/location/common/resources/checkbox.png
diff --git a/examples/declarative/common/resources/checkbox_selected.png b/examples/location/common/resources/checkbox_selected.png
index 28b32f58..28b32f58 100644
--- a/examples/declarative/common/resources/checkbox_selected.png
+++ b/examples/location/common/resources/checkbox_selected.png
diff --git a/examples/declarative/common/resources/cross.png b/examples/location/common/resources/cross.png
index 835cd91a..835cd91a 100644
--- a/examples/declarative/common/resources/cross.png
+++ b/examples/location/common/resources/cross.png
diff --git a/examples/declarative/common/resources/cross_hovered.png b/examples/location/common/resources/cross_hovered.png
index fdd23d79..fdd23d79 100644
--- a/examples/declarative/common/resources/cross_hovered.png
+++ b/examples/location/common/resources/cross_hovered.png
diff --git a/examples/declarative/common/resources/cross_pressed.png b/examples/location/common/resources/cross_pressed.png
index c7a692af..c7a692af 100644
--- a/examples/declarative/common/resources/cross_pressed.png
+++ b/examples/location/common/resources/cross_pressed.png
diff --git a/examples/declarative/common/resources/hmenuItem.png b/examples/location/common/resources/hmenuItem.png
index f2461f2d..f2461f2d 100644
--- a/examples/declarative/common/resources/hmenuItem.png
+++ b/examples/location/common/resources/hmenuItem.png
diff --git a/examples/declarative/common/resources/hmenuItem_pressed.png b/examples/location/common/resources/hmenuItem_pressed.png
index 43336d1e..43336d1e 100644
--- a/examples/declarative/common/resources/hmenuItem_pressed.png
+++ b/examples/location/common/resources/hmenuItem_pressed.png
diff --git a/examples/declarative/common/resources/left.png b/examples/location/common/resources/left.png
index c0efa646..c0efa646 100644
--- a/examples/declarative/common/resources/left.png
+++ b/examples/location/common/resources/left.png
diff --git a/examples/declarative/common/resources/left_pressed.png b/examples/location/common/resources/left_pressed.png
index b4fee456..b4fee456 100644
--- a/examples/declarative/common/resources/left_pressed.png
+++ b/examples/location/common/resources/left_pressed.png
diff --git a/examples/declarative/common/resources/marker.png b/examples/location/common/resources/marker.png
index 86ec960e..86ec960e 100644
--- a/examples/declarative/common/resources/marker.png
+++ b/examples/location/common/resources/marker.png
diff --git a/examples/declarative/common/resources/marker_hovered.png b/examples/location/common/resources/marker_hovered.png
index 902ae591..902ae591 100644
--- a/examples/declarative/common/resources/marker_hovered.png
+++ b/examples/location/common/resources/marker_hovered.png
diff --git a/examples/declarative/common/resources/marker_selected.png b/examples/location/common/resources/marker_selected.png
index f4bf8921..f4bf8921 100644
--- a/examples/declarative/common/resources/marker_selected.png
+++ b/examples/location/common/resources/marker_selected.png
diff --git a/examples/declarative/common/resources/node.png b/examples/location/common/resources/node.png
index 46e85672..46e85672 100644
--- a/examples/declarative/common/resources/node.png
+++ b/examples/location/common/resources/node.png
diff --git a/examples/declarative/common/resources/node_selected.png b/examples/location/common/resources/node_selected.png
index a967f3cf..a967f3cf 100644
--- a/examples/declarative/common/resources/node_selected.png
+++ b/examples/location/common/resources/node_selected.png
diff --git a/examples/declarative/common/resources/option_button.png b/examples/location/common/resources/option_button.png
index 90970424..90970424 100644
--- a/examples/declarative/common/resources/option_button.png
+++ b/examples/location/common/resources/option_button.png
diff --git a/examples/declarative/common/resources/option_button_selected.png b/examples/location/common/resources/option_button_selected.png
index f1196286..f1196286 100644
--- a/examples/declarative/common/resources/option_button_selected.png
+++ b/examples/location/common/resources/option_button_selected.png
diff --git a/examples/declarative/common/resources/pencil.png b/examples/location/common/resources/pencil.png
index a52cff02..a52cff02 100644
--- a/examples/declarative/common/resources/pencil.png
+++ b/examples/location/common/resources/pencil.png
diff --git a/examples/declarative/common/resources/pencil_hovered.png b/examples/location/common/resources/pencil_hovered.png
index 55053fc1..55053fc1 100644
--- a/examples/declarative/common/resources/pencil_hovered.png
+++ b/examples/location/common/resources/pencil_hovered.png
diff --git a/examples/declarative/common/resources/pencil_pressed.png b/examples/location/common/resources/pencil_pressed.png
index f30f3703..f30f3703 100644
--- a/examples/declarative/common/resources/pencil_pressed.png
+++ b/examples/location/common/resources/pencil_pressed.png
diff --git a/examples/declarative/common/resources/quit.png b/examples/location/common/resources/quit.png
index 9a5cb8a2..9a5cb8a2 100644
--- a/examples/declarative/common/resources/quit.png
+++ b/examples/location/common/resources/quit.png
diff --git a/examples/declarative/common/resources/quit_hovered.png b/examples/location/common/resources/quit_hovered.png
index bea8f251..bea8f251 100644
--- a/examples/declarative/common/resources/quit_hovered.png
+++ b/examples/location/common/resources/quit_hovered.png
diff --git a/examples/declarative/common/resources/quit_pressed.png b/examples/location/common/resources/quit_pressed.png
index e69aa111..e69aa111 100644
--- a/examples/declarative/common/resources/quit_pressed.png
+++ b/examples/location/common/resources/quit_pressed.png
diff --git a/examples/declarative/common/resources/right.png b/examples/location/common/resources/right.png
index db343b07..db343b07 100644
--- a/examples/declarative/common/resources/right.png
+++ b/examples/location/common/resources/right.png
diff --git a/examples/declarative/common/resources/right_pressed.png b/examples/location/common/resources/right_pressed.png
index 111f386b..111f386b 100644
--- a/examples/declarative/common/resources/right_pressed.png
+++ b/examples/location/common/resources/right_pressed.png
diff --git a/examples/declarative/common/resources/scale.png b/examples/location/common/resources/scale.png
index 6e59ff08..6e59ff08 100644
--- a/examples/declarative/common/resources/scale.png
+++ b/examples/location/common/resources/scale.png
diff --git a/examples/declarative/common/resources/scale_end.png b/examples/location/common/resources/scale_end.png
index 5d3a471b..5d3a471b 100644
--- a/examples/declarative/common/resources/scale_end.png
+++ b/examples/location/common/resources/scale_end.png
diff --git a/examples/declarative/common/resources/search.png b/examples/location/common/resources/search.png
index 6bad5bd7..6bad5bd7 100644
--- a/examples/declarative/common/resources/search.png
+++ b/examples/location/common/resources/search.png
diff --git a/examples/declarative/common/resources/search_pressed.png b/examples/location/common/resources/search_pressed.png
index 23c92fa3..23c92fa3 100644
--- a/examples/declarative/common/resources/search_pressed.png
+++ b/examples/location/common/resources/search_pressed.png
diff --git a/examples/declarative/common/resources/star.png b/examples/location/common/resources/star.png
index 93451147..93451147 100644
--- a/examples/declarative/common/resources/star.png
+++ b/examples/location/common/resources/star.png
diff --git a/examples/declarative/common/resources/titlebar.png b/examples/location/common/resources/titlebar.png
index 5b1d09a1..5b1d09a1 100644
--- a/examples/declarative/common/resources/titlebar.png
+++ b/examples/location/common/resources/titlebar.png
diff --git a/examples/declarative/common/resources/titlebar.sci b/examples/location/common/resources/titlebar.sci
index 0418d94c..0418d94c 100644
--- a/examples/declarative/common/resources/titlebar.sci
+++ b/examples/location/common/resources/titlebar.sci
diff --git a/examples/declarative/common/resources/vmenuItem.png b/examples/location/common/resources/vmenuItem.png
index 9e4385e7..9e4385e7 100644
--- a/examples/declarative/common/resources/vmenuItem.png
+++ b/examples/location/common/resources/vmenuItem.png
diff --git a/examples/location/location.pro b/examples/location/location.pro
new file mode 100644
index 00000000..c186b7fc
--- /dev/null
+++ b/examples/location/location.pro
@@ -0,0 +1,9 @@
+TEMPLATE = subdirs
+
+qtHaveModule(quick) {
+    SUBDIRS += places \
+               places_list \
+               places_map
+
+    qtHaveModule(multimedia): SUBDIRS += mapviewer
+}
diff --git a/examples/declarative/mapviewer/content/dialogs/Message.qml b/examples/location/mapviewer/content/dialogs/Message.qml
index 7488eb83..7488eb83 100644
--- a/examples/declarative/mapviewer/content/dialogs/Message.qml
+++ b/examples/location/mapviewer/content/dialogs/Message.qml
diff --git a/examples/declarative/mapviewer/content/dialogs/RouteDialog.qml b/examples/location/mapviewer/content/dialogs/RouteDialog.qml
index 73e5f3d1..73e5f3d1 100644
--- a/examples/declarative/mapviewer/content/dialogs/RouteDialog.qml
+++ b/examples/location/mapviewer/content/dialogs/RouteDialog.qml
diff --git a/examples/declarative/mapviewer/content/map/3dItem.qml b/examples/location/mapviewer/content/map/3dItem.qml
index 4c190429..4c190429 100644
--- a/examples/declarative/mapviewer/content/map/3dItem.qml
+++ b/examples/location/mapviewer/content/map/3dItem.qml
diff --git a/examples/declarative/mapviewer/content/map/CircleItem.qml b/examples/location/mapviewer/content/map/CircleItem.qml
index d7f03402..d7f03402 100644
--- a/examples/declarative/mapviewer/content/map/CircleItem.qml
+++ b/examples/location/mapviewer/content/map/CircleItem.qml
diff --git a/examples/declarative/mapviewer/content/map/ImageItem.qml b/examples/location/mapviewer/content/map/ImageItem.qml
index a7146fbf..a7146fbf 100644
--- a/examples/declarative/mapviewer/content/map/ImageItem.qml
+++ b/examples/location/mapviewer/content/map/ImageItem.qml
diff --git a/examples/declarative/mapviewer/content/map/MapComponent.qml b/examples/location/mapviewer/content/map/MapComponent.qml
index e51373a7..e51373a7 100644
--- a/examples/declarative/mapviewer/content/map/MapComponent.qml
+++ b/examples/location/mapviewer/content/map/MapComponent.qml
diff --git a/examples/declarative/mapviewer/content/map/Marker.qml b/examples/location/mapviewer/content/map/Marker.qml
index d7a1e838..d7a1e838 100644
--- a/examples/declarative/mapviewer/content/map/Marker.qml
+++ b/examples/location/mapviewer/content/map/Marker.qml
diff --git a/examples/declarative/mapviewer/content/map/MiniMap.qml b/examples/location/mapviewer/content/map/MiniMap.qml
index e5d03e49..e5d03e49 100644
--- a/examples/declarative/mapviewer/content/map/MiniMap.qml
+++ b/examples/location/mapviewer/content/map/MiniMap.qml
diff --git a/examples/declarative/mapviewer/content/map/PolygonItem.qml b/examples/location/mapviewer/content/map/PolygonItem.qml
index b6e41ea6..b6e41ea6 100644
--- a/examples/declarative/mapviewer/content/map/PolygonItem.qml
+++ b/examples/location/mapviewer/content/map/PolygonItem.qml
diff --git a/examples/declarative/mapviewer/content/map/PolylineItem.qml b/examples/location/mapviewer/content/map/PolylineItem.qml
index f065142e..f065142e 100644
--- a/examples/declarative/mapviewer/content/map/PolylineItem.qml
+++ b/examples/location/mapviewer/content/map/PolylineItem.qml
diff --git a/examples/declarative/mapviewer/content/map/RectangleItem.qml b/examples/location/mapviewer/content/map/RectangleItem.qml
index 97896883..97896883 100644
--- a/examples/declarative/mapviewer/content/map/RectangleItem.qml
+++ b/examples/location/mapviewer/content/map/RectangleItem.qml
diff --git a/examples/declarative/mapviewer/content/map/VideoItem.qml b/examples/location/mapviewer/content/map/VideoItem.qml
index a3df3c99..a3df3c99 100644
--- a/examples/declarative/mapviewer/content/map/VideoItem.qml
+++ b/examples/location/mapviewer/content/map/VideoItem.qml
diff --git a/examples/declarative/mapviewer/demo.ogv b/examples/location/mapviewer/demo.ogv
index 1ed7e540..1ed7e540 100644
--- a/examples/declarative/mapviewer/demo.ogv
+++ b/examples/location/mapviewer/demo.ogv
diff --git a/examples/declarative/mapviewer/icon.png b/examples/location/mapviewer/icon.png
index 0954baf0..0954baf0 100644
--- a/examples/declarative/mapviewer/icon.png
+++ b/examples/location/mapviewer/icon.png
diff --git a/examples/declarative/mapviewer/mapviewer.pro b/examples/location/mapviewer/mapviewer.pro
index 7ae7b4dc..36fead08 100644
--- a/examples/declarative/mapviewer/mapviewer.pro
+++ b/examples/location/mapviewer/mapviewer.pro
@@ -32,7 +32,7 @@ OTHER_FILES += $$qmlcontentdialogs.files
 
 include(../common/common.pri)
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/mapviewer
+target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/mapviewer
 
 INSTALLS += target
 
diff --git a/examples/declarative/mapviewer/mapviewer.qml b/examples/location/mapviewer/mapviewer.qml
index 59a5de5c..59a5de5c 100644
--- a/examples/declarative/mapviewer/mapviewer.qml
+++ b/examples/location/mapviewer/mapviewer.qml
diff --git a/examples/declarative/mapviewer/mapviewerwrapper.qrc b/examples/location/mapviewer/mapviewerwrapper.qrc
index 854a6503..854a6503 100644
--- a/examples/declarative/mapviewer/mapviewerwrapper.qrc
+++ b/examples/location/mapviewer/mapviewerwrapper.qrc
diff --git a/examples/declarative/mapviewer/qmlmapviewerwrapper.cpp b/examples/location/mapviewer/qmlmapviewerwrapper.cpp
index 5f5aee84..5f5aee84 100644
--- a/examples/declarative/mapviewer/qmlmapviewerwrapper.cpp
+++ b/examples/location/mapviewer/qmlmapviewerwrapper.cpp
diff --git a/examples/declarative/places/content/places/CategoryDelegate.qml b/examples/location/places/content/places/CategoryDelegate.qml
index 4bb2b8e0..4bb2b8e0 100644
--- a/examples/declarative/places/content/places/CategoryDelegate.qml
+++ b/examples/location/places/content/places/CategoryDelegate.qml
diff --git a/examples/declarative/places/content/places/CategoryDialog.qml b/examples/location/places/content/places/CategoryDialog.qml
index 289d8501..289d8501 100644
--- a/examples/declarative/places/content/places/CategoryDialog.qml
+++ b/examples/location/places/content/places/CategoryDialog.qml
diff --git a/examples/declarative/places/content/places/CategoryView.qml b/examples/location/places/content/places/CategoryView.qml
index 9b28e892..9b28e892 100644
--- a/examples/declarative/places/content/places/CategoryView.qml
+++ b/examples/location/places/content/places/CategoryView.qml
diff --git a/examples/declarative/places/content/places/EditorialDelegate.qml b/examples/location/places/content/places/EditorialDelegate.qml
index fa33bcf0..fa33bcf0 100644
--- a/examples/declarative/places/content/places/EditorialDelegate.qml
+++ b/examples/location/places/content/places/EditorialDelegate.qml
diff --git a/examples/declarative/places/content/places/EditorialPage.qml b/examples/location/places/content/places/EditorialPage.qml
index 60f175d3..60f175d3 100644
--- a/examples/declarative/places/content/places/EditorialPage.qml
+++ b/examples/location/places/content/places/EditorialPage.qml
diff --git a/examples/declarative/places/content/places/Group.qml b/examples/location/places/content/places/Group.qml
index ac44d905..ac44d905 100644
--- a/examples/declarative/places/content/places/Group.qml
+++ b/examples/location/places/content/places/Group.qml
diff --git a/examples/declarative/places/content/places/MapComponent.qml b/examples/location/places/content/places/MapComponent.qml
index 00ba9b2e..00ba9b2e 100644
--- a/examples/declarative/places/content/places/MapComponent.qml
+++ b/examples/location/places/content/places/MapComponent.qml
diff --git a/examples/declarative/places/content/places/OptionsDialog.qml b/examples/location/places/content/places/OptionsDialog.qml
index 7b7c9266..7b7c9266 100644
--- a/examples/declarative/places/content/places/OptionsDialog.qml
+++ b/examples/location/places/content/places/OptionsDialog.qml
diff --git a/examples/declarative/places/content/places/PlaceDelegate.qml b/examples/location/places/content/places/PlaceDelegate.qml
index 90a2cceb..90a2cceb 100644
--- a/examples/declarative/places/content/places/PlaceDelegate.qml
+++ b/examples/location/places/content/places/PlaceDelegate.qml
diff --git a/examples/declarative/places/content/places/PlaceDialog.qml b/examples/location/places/content/places/PlaceDialog.qml
index ed08716d..ed08716d 100644
--- a/examples/declarative/places/content/places/PlaceDialog.qml
+++ b/examples/location/places/content/places/PlaceDialog.qml
diff --git a/examples/declarative/places/content/places/PlaceEditorials.qml b/examples/location/places/content/places/PlaceEditorials.qml
index 06cff09c..06cff09c 100644
--- a/examples/declarative/places/content/places/PlaceEditorials.qml
+++ b/examples/location/places/content/places/PlaceEditorials.qml
diff --git a/examples/declarative/places/content/places/PlaceImages.qml b/examples/location/places/content/places/PlaceImages.qml
index be18a923..be18a923 100644
--- a/examples/declarative/places/content/places/PlaceImages.qml
+++ b/examples/location/places/content/places/PlaceImages.qml
diff --git a/examples/declarative/places/content/places/PlaceReviews.qml b/examples/location/places/content/places/PlaceReviews.qml
index 3d54c52c..3d54c52c 100644
--- a/examples/declarative/places/content/places/PlaceReviews.qml
+++ b/examples/location/places/content/places/PlaceReviews.qml
diff --git a/examples/declarative/places/content/places/PlacesUtils.js b/examples/location/places/content/places/PlacesUtils.js
index 756deb99..756deb99 100644
--- a/examples/declarative/places/content/places/PlacesUtils.js
+++ b/examples/location/places/content/places/PlacesUtils.js
diff --git a/examples/declarative/places/content/places/RatingView.qml b/examples/location/places/content/places/RatingView.qml
index 255bb8b8..255bb8b8 100644
--- a/examples/declarative/places/content/places/RatingView.qml
+++ b/examples/location/places/content/places/RatingView.qml
diff --git a/examples/declarative/places/content/places/ReviewDelegate.qml b/examples/location/places/content/places/ReviewDelegate.qml
index 50753e09..50753e09 100644
--- a/examples/declarative/places/content/places/ReviewDelegate.qml
+++ b/examples/location/places/content/places/ReviewDelegate.qml
diff --git a/examples/declarative/places/content/places/ReviewPage.qml b/examples/location/places/content/places/ReviewPage.qml
index c7287e19..c7287e19 100644
--- a/examples/declarative/places/content/places/ReviewPage.qml
+++ b/examples/location/places/content/places/ReviewPage.qml
diff --git a/examples/declarative/places/content/places/SearchBox.qml b/examples/location/places/content/places/SearchBox.qml
index 335af339..335af339 100644
--- a/examples/declarative/places/content/places/SearchBox.qml
+++ b/examples/location/places/content/places/SearchBox.qml
diff --git a/examples/declarative/places/content/places/SearchResultDelegate.qml b/examples/location/places/content/places/SearchResultDelegate.qml
index 76b64e83..76b64e83 100644
--- a/examples/declarative/places/content/places/SearchResultDelegate.qml
+++ b/examples/location/places/content/places/SearchResultDelegate.qml
diff --git a/examples/declarative/places/content/places/SearchResultView.qml b/examples/location/places/content/places/SearchResultView.qml
index b9d48776..b9d48776 100644
--- a/examples/declarative/places/content/places/SearchResultView.qml
+++ b/examples/location/places/content/places/SearchResultView.qml
diff --git a/examples/declarative/places/icon.png b/examples/location/places/icon.png
index 0954baf0..0954baf0 100644
--- a/examples/declarative/places/icon.png
+++ b/examples/location/places/icon.png
diff --git a/examples/declarative/places/places.pro b/examples/location/places/places.pro
index ab9b1547..459a241e 100644
--- a/examples/declarative/places/places.pro
+++ b/examples/location/places/places.pro
@@ -37,7 +37,7 @@ OTHER_FILES += $$qmlcontentplaces.files
 
 include(../common/common.pri)
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/places
+target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/places
 
 INSTALLS += target
 
diff --git a/examples/declarative/places/places.qml b/examples/location/places/places.qml
index 6b4b32dd..6b4b32dd 100644
--- a/examples/declarative/places/places.qml
+++ b/examples/location/places/places.qml
diff --git a/examples/declarative/places/placeswrapper.qrc b/examples/location/places/placeswrapper.qrc
index 1e69207e..1e69207e 100644
--- a/examples/declarative/places/placeswrapper.qrc
+++ b/examples/location/places/placeswrapper.qrc
diff --git a/examples/declarative/places/qmlplaceswrapper.cpp b/examples/location/places/qmlplaceswrapper.cpp
index 5856d8c9..5856d8c9 100644
--- a/examples/declarative/places/qmlplaceswrapper.cpp
+++ b/examples/location/places/qmlplaceswrapper.cpp
diff --git a/examples/declarative/places_list/main.cpp b/examples/location/places_list/main.cpp
index 4ddb93ec..4ddb93ec 100644
--- a/examples/declarative/places_list/main.cpp
+++ b/examples/location/places_list/main.cpp
diff --git a/examples/location/places_list/places_list.pro b/examples/location/places_list/places_list.pro
new file mode 100644
index 00000000..2d4b29ab
--- /dev/null
+++ b/examples/location/places_list/places_list.pro
@@ -0,0 +1,12 @@
+TARGET = places_list
+TEMPLATE = app
+
+QT += quick qml network
+SOURCES = main.cpp
+
+qmlcontent.files += $$files(*.qml)
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/places_list
+qmlcontent.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/places_list
+
+INSTALLS += target qmlcontent
diff --git a/examples/declarative/places_list/places_list.qml b/examples/location/places_list/places_list.qml
index d3911d3c..d3911d3c 100644
--- a/examples/declarative/places_list/places_list.qml
+++ b/examples/location/places_list/places_list.qml
diff --git a/examples/declarative/places_map/main.cpp b/examples/location/places_map/main.cpp
index b93cac43..b93cac43 100644
--- a/examples/declarative/places_map/main.cpp
+++ b/examples/location/places_map/main.cpp
diff --git a/examples/declarative/places_map/marker.png b/examples/location/places_map/marker.png
index 86ec960e..86ec960e 100644
--- a/examples/declarative/places_map/marker.png
+++ b/examples/location/places_map/marker.png
diff --git a/examples/declarative/places_map/places_map.pro b/examples/location/places_map/places_map.pro
index 34f5ad92..5f7d3eaf 100644
--- a/examples/declarative/places_map/places_map.pro
+++ b/examples/location/places_map/places_map.pro
@@ -7,7 +7,7 @@ SOURCES = main.cpp
 qmlcontent.files += $$files(*.qml) \
                     marker.png
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/places_map
-qmlcontent.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/places_map
+target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/places_map
+qmlcontent.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/places_map
 
 INSTALLS += target qmlcontent
diff --git a/examples/declarative/places_map/places_map.qml b/examples/location/places_map/places_map.qml
index 87a254a8..87a254a8 100644
--- a/examples/declarative/places_map/places_map.qml
+++ b/examples/location/places_map/places_map.qml
diff --git a/examples/declarative/flickr/flickr-90.qml b/examples/positioning/flickr/flickr-90.qml
index 24e61c04..24e61c04 100644
--- a/examples/declarative/flickr/flickr-90.qml
+++ b/examples/positioning/flickr/flickr-90.qml
diff --git a/examples/declarative/flickr/flickr.pro b/examples/positioning/flickr/flickr.pro
index ff83bcb2..9014935d 100644
--- a/examples/declarative/flickr/flickr.pro
+++ b/examples/positioning/flickr/flickr.pro
@@ -9,8 +9,8 @@ RESOURCES += \
 
 OTHER_FILES += flickr.qml
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/declarative/flickr
+target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/flickr
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.qml flickrcommon flickrmobile
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/declarative/flickr
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/flickr
 
 INSTALLS += target sources
diff --git a/examples/declarative/flickr/flickr.qml b/examples/positioning/flickr/flickr.qml
index 0960b4c9..0960b4c9 100644
--- a/examples/declarative/flickr/flickr.qml
+++ b/examples/positioning/flickr/flickr.qml
diff --git a/examples/declarative/flickr/flickr.qmlproject b/examples/positioning/flickr/flickr.qmlproject
index d4909f86..d4909f86 100644
--- a/examples/declarative/flickr/flickr.qmlproject
+++ b/examples/positioning/flickr/flickr.qmlproject
diff --git a/examples/declarative/flickr/flickr.qrc b/examples/positioning/flickr/flickr.qrc
index 1019f7d8..1019f7d8 100644
--- a/examples/declarative/flickr/flickr.qrc
+++ b/examples/positioning/flickr/flickr.qrc
diff --git a/examples/declarative/flickr/flickrcommon/Progress.qml b/examples/positioning/flickr/flickrcommon/Progress.qml
index 33dfadf7..33dfadf7 100644
--- a/examples/declarative/flickr/flickrcommon/Progress.qml
+++ b/examples/positioning/flickr/flickrcommon/Progress.qml
diff --git a/examples/declarative/flickr/flickrcommon/RestModel.qml b/examples/positioning/flickr/flickrcommon/RestModel.qml
index d8d5e87e..d8d5e87e 100644
--- a/examples/declarative/flickr/flickrcommon/RestModel.qml
+++ b/examples/positioning/flickr/flickrcommon/RestModel.qml
diff --git a/examples/declarative/flickr/flickrcommon/ScrollBar.qml b/examples/positioning/flickr/flickrcommon/ScrollBar.qml
index fd67f557..fd67f557 100644
--- a/examples/declarative/flickr/flickrcommon/ScrollBar.qml
+++ b/examples/positioning/flickr/flickrcommon/ScrollBar.qml
diff --git a/examples/declarative/flickr/flickrcommon/Slider.qml b/examples/positioning/flickr/flickrcommon/Slider.qml
index f01ed53a..f01ed53a 100644
--- a/examples/declarative/flickr/flickrcommon/Slider.qml
+++ b/examples/positioning/flickr/flickrcommon/Slider.qml
diff --git a/examples/declarative/flickr/flickrmobile/Button.qml b/examples/positioning/flickr/flickrmobile/Button.qml
index c24877ea..c24877ea 100644
--- a/examples/declarative/flickr/flickrmobile/Button.qml
+++ b/examples/positioning/flickr/flickrmobile/Button.qml
diff --git a/examples/declarative/flickr/flickrmobile/GeoTab.qml b/examples/positioning/flickr/flickrmobile/GeoTab.qml
index 53066190..53066190 100644
--- a/examples/declarative/flickr/flickrmobile/GeoTab.qml
+++ b/examples/positioning/flickr/flickrmobile/GeoTab.qml
diff --git a/examples/declarative/flickr/flickrmobile/GridDelegate.qml b/examples/positioning/flickr/flickrmobile/GridDelegate.qml
index 4eca4d8b..4eca4d8b 100644
--- a/examples/declarative/flickr/flickrmobile/GridDelegate.qml
+++ b/examples/positioning/flickr/flickrmobile/GridDelegate.qml
diff --git a/examples/declarative/flickr/flickrmobile/ImageDetails.qml b/examples/positioning/flickr/flickrmobile/ImageDetails.qml
index a06d66a5..a06d66a5 100644
--- a/examples/declarative/flickr/flickrmobile/ImageDetails.qml
+++ b/examples/positioning/flickr/flickrmobile/ImageDetails.qml
diff --git a/examples/declarative/flickr/flickrmobile/ListDelegate.qml b/examples/positioning/flickr/flickrmobile/ListDelegate.qml
index baec7205..baec7205 100644
--- a/examples/declarative/flickr/flickrmobile/ListDelegate.qml
+++ b/examples/positioning/flickr/flickrmobile/ListDelegate.qml
diff --git a/examples/declarative/flickr/flickrmobile/TitleBar.qml b/examples/positioning/flickr/flickrmobile/TitleBar.qml
index f304d88f..f304d88f 100644
--- a/examples/declarative/flickr/flickrmobile/TitleBar.qml
+++ b/examples/positioning/flickr/flickrmobile/TitleBar.qml
diff --git a/examples/declarative/flickr/flickrmobile/ToolBar.qml b/examples/positioning/flickr/flickrmobile/ToolBar.qml
index bdc53ef7..bdc53ef7 100644
--- a/examples/declarative/flickr/flickrmobile/ToolBar.qml
+++ b/examples/positioning/flickr/flickrmobile/ToolBar.qml
diff --git a/examples/declarative/flickr/flickrmobile/images/gloss.png b/examples/positioning/flickr/flickrmobile/images/gloss.png
index 5d370cd9..5d370cd9 100644
--- a/examples/declarative/flickr/flickrmobile/images/gloss.png
+++ b/examples/positioning/flickr/flickrmobile/images/gloss.png
diff --git a/examples/declarative/flickr/flickrmobile/images/lineedit.png b/examples/positioning/flickr/flickrmobile/images/lineedit.png
index 2cc38dc3..2cc38dc3 100644
--- a/examples/declarative/flickr/flickrmobile/images/lineedit.png
+++ b/examples/positioning/flickr/flickrmobile/images/lineedit.png
diff --git a/examples/declarative/flickr/flickrmobile/images/lineedit.sci b/examples/positioning/flickr/flickrmobile/images/lineedit.sci
index 054bff78..054bff78 100644
--- a/examples/declarative/flickr/flickrmobile/images/lineedit.sci
+++ b/examples/positioning/flickr/flickrmobile/images/lineedit.sci
diff --git a/examples/declarative/flickr/flickrmobile/images/moon.png b/examples/positioning/flickr/flickrmobile/images/moon.png
index 9407b2b4..9407b2b4 100644
--- a/examples/declarative/flickr/flickrmobile/images/moon.png
+++ b/examples/positioning/flickr/flickrmobile/images/moon.png
diff --git a/examples/declarative/flickr/flickrmobile/images/quit.png b/examples/positioning/flickr/flickrmobile/images/quit.png
index 5bda1b6e..5bda1b6e 100644
--- a/examples/declarative/flickr/flickrmobile/images/quit.png
+++ b/examples/positioning/flickr/flickrmobile/images/quit.png
diff --git a/examples/declarative/flickr/flickrmobile/images/star.png b/examples/positioning/flickr/flickrmobile/images/star.png
index 27ef9242..27ef9242 100644
--- a/examples/declarative/flickr/flickrmobile/images/star.png
+++ b/examples/positioning/flickr/flickrmobile/images/star.png
diff --git a/examples/declarative/flickr/flickrmobile/images/stripes.png b/examples/positioning/flickr/flickrmobile/images/stripes.png
index 9f36727e..9f36727e 100644
--- a/examples/declarative/flickr/flickrmobile/images/stripes.png
+++ b/examples/positioning/flickr/flickrmobile/images/stripes.png
diff --git a/examples/declarative/flickr/flickrmobile/images/sun.png b/examples/positioning/flickr/flickrmobile/images/sun.png
index 7713ca5c..7713ca5c 100644
--- a/examples/declarative/flickr/flickrmobile/images/sun.png
+++ b/examples/positioning/flickr/flickrmobile/images/sun.png
diff --git a/examples/declarative/flickr/flickrmobile/images/titlebar.png b/examples/positioning/flickr/flickrmobile/images/titlebar.png
index 51c90082..51c90082 100644
--- a/examples/declarative/flickr/flickrmobile/images/titlebar.png
+++ b/examples/positioning/flickr/flickrmobile/images/titlebar.png
diff --git a/examples/declarative/flickr/flickrmobile/images/titlebar.sci b/examples/positioning/flickr/flickrmobile/images/titlebar.sci
index 0418d94c..0418d94c 100644
--- a/examples/declarative/flickr/flickrmobile/images/titlebar.sci
+++ b/examples/positioning/flickr/flickrmobile/images/titlebar.sci
diff --git a/examples/declarative/flickr/flickrmobile/images/toolbutton.png b/examples/positioning/flickr/flickrmobile/images/toolbutton.png
index 11310013..11310013 100644
--- a/examples/declarative/flickr/flickrmobile/images/toolbutton.png
+++ b/examples/positioning/flickr/flickrmobile/images/toolbutton.png
diff --git a/examples/declarative/flickr/flickrmobile/images/toolbutton.sci b/examples/positioning/flickr/flickrmobile/images/toolbutton.sci
index 9e4f9653..9e4f9653 100644
--- a/examples/declarative/flickr/flickrmobile/images/toolbutton.sci
+++ b/examples/positioning/flickr/flickrmobile/images/toolbutton.sci
diff --git a/examples/declarative/flickr/flickrmobile/nmealog.txt b/examples/positioning/flickr/flickrmobile/nmealog.txt
index 8c8286dd..8c8286dd 100644
--- a/examples/declarative/flickr/flickrmobile/nmealog.txt
+++ b/examples/positioning/flickr/flickrmobile/nmealog.txt
diff --git a/examples/declarative/flickr/qmllocationflickr.cpp b/examples/positioning/flickr/qmllocationflickr.cpp
index 8a3a29a3..8a3a29a3 100644
--- a/examples/declarative/flickr/qmllocationflickr.cpp
+++ b/examples/positioning/flickr/qmllocationflickr.cpp
diff --git a/examples/logfilepositionsource/clientapplication.cpp b/examples/positioning/logfilepositionsource/clientapplication.cpp
index 6e4025d5..6e4025d5 100644
--- a/examples/logfilepositionsource/clientapplication.cpp
+++ b/examples/positioning/logfilepositionsource/clientapplication.cpp
diff --git a/examples/logfilepositionsource/clientapplication.h b/examples/positioning/logfilepositionsource/clientapplication.h
index 13a33ec3..13a33ec3 100644
--- a/examples/logfilepositionsource/clientapplication.h
+++ b/examples/positioning/logfilepositionsource/clientapplication.h
diff --git a/examples/logfilepositionsource/logfilepositionsource.cpp b/examples/positioning/logfilepositionsource/logfilepositionsource.cpp
index 0f3c45dd..0f3c45dd 100644
--- a/examples/logfilepositionsource/logfilepositionsource.cpp
+++ b/examples/positioning/logfilepositionsource/logfilepositionsource.cpp
diff --git a/examples/logfilepositionsource/logfilepositionsource.h b/examples/positioning/logfilepositionsource/logfilepositionsource.h
index 35a0a1dd..35a0a1dd 100644
--- a/examples/logfilepositionsource/logfilepositionsource.h
+++ b/examples/positioning/logfilepositionsource/logfilepositionsource.h
diff --git a/examples/logfilepositionsource/logfilepositionsource.pro b/examples/positioning/logfilepositionsource/logfilepositionsource.pro
index bd00a169..bd00a169 100644
--- a/examples/logfilepositionsource/logfilepositionsource.pro
+++ b/examples/positioning/logfilepositionsource/logfilepositionsource.pro
diff --git a/examples/logfilepositionsource/main.cpp b/examples/positioning/logfilepositionsource/main.cpp
index 10e68499..10e68499 100644
--- a/examples/logfilepositionsource/main.cpp
+++ b/examples/positioning/logfilepositionsource/main.cpp
diff --git a/examples/logfilepositionsource/simplelog.txt b/examples/positioning/logfilepositionsource/simplelog.txt
index d016b2a8..d016b2a8 100644
--- a/examples/logfilepositionsource/simplelog.txt
+++ b/examples/positioning/logfilepositionsource/simplelog.txt
diff --git a/examples/positioning/positioning.pro b/examples/positioning/positioning.pro
new file mode 100644
index 00000000..468ff9eb
--- /dev/null
+++ b/examples/positioning/positioning.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+qtHaveModule(widgets): SUBDIRS += logfilepositionsource
+qtHaveModule(quick): SUBDIRS += flickr weatherinfo
diff --git a/examples/weatherinfo/appmodel.cpp b/examples/positioning/weatherinfo/appmodel.cpp
index d0a37265..d0a37265 100644
--- a/examples/weatherinfo/appmodel.cpp
+++ b/examples/positioning/weatherinfo/appmodel.cpp
diff --git a/examples/weatherinfo/appmodel.h b/examples/positioning/weatherinfo/appmodel.h
index e0d32148..e0d32148 100644
--- a/examples/weatherinfo/appmodel.h
+++ b/examples/positioning/weatherinfo/appmodel.h
diff --git a/examples/weatherinfo/components/BigForecastIcon.qml b/examples/positioning/weatherinfo/components/BigForecastIcon.qml
index 6583d6d3..6583d6d3 100644
--- a/examples/weatherinfo/components/BigForecastIcon.qml
+++ b/examples/positioning/weatherinfo/components/BigForecastIcon.qml
diff --git a/examples/weatherinfo/components/ForecastIcon.qml b/examples/positioning/weatherinfo/components/ForecastIcon.qml
index a1393932..a1393932 100644
--- a/examples/weatherinfo/components/ForecastIcon.qml
+++ b/examples/positioning/weatherinfo/components/ForecastIcon.qml
diff --git a/examples/weatherinfo/components/WeatherIcon.qml b/examples/positioning/weatherinfo/components/WeatherIcon.qml
index 485a15a5..485a15a5 100644
--- a/examples/weatherinfo/components/WeatherIcon.qml
+++ b/examples/positioning/weatherinfo/components/WeatherIcon.qml
diff --git a/examples/weatherinfo/icons/README.txt b/examples/positioning/weatherinfo/icons/README.txt
index d3841532..d3841532 100644
--- a/examples/weatherinfo/icons/README.txt
+++ b/examples/positioning/weatherinfo/icons/README.txt
diff --git a/examples/weatherinfo/icons/weather-few-clouds.png b/examples/positioning/weatherinfo/icons/weather-few-clouds.png
index a8000ef0..a8000ef0 100644
--- a/examples/weatherinfo/icons/weather-few-clouds.png
+++ b/examples/positioning/weatherinfo/icons/weather-few-clouds.png
diff --git a/examples/weatherinfo/icons/weather-fog.png b/examples/positioning/weatherinfo/icons/weather-fog.png
index 9ffe9c4a..9ffe9c4a 100644
--- a/examples/weatherinfo/icons/weather-fog.png
+++ b/examples/positioning/weatherinfo/icons/weather-fog.png
diff --git a/examples/weatherinfo/icons/weather-haze.png b/examples/positioning/weatherinfo/icons/weather-haze.png
index ae6f13eb..ae6f13eb 100644
--- a/examples/weatherinfo/icons/weather-haze.png
+++ b/examples/positioning/weatherinfo/icons/weather-haze.png
diff --git a/examples/weatherinfo/icons/weather-icy.png b/examples/positioning/weatherinfo/icons/weather-icy.png
index 18d20384..18d20384 100644
--- a/examples/weatherinfo/icons/weather-icy.png
+++ b/examples/positioning/weatherinfo/icons/weather-icy.png
diff --git a/examples/weatherinfo/icons/weather-overcast.png b/examples/positioning/weatherinfo/icons/weather-overcast.png
index 9d50f77f..9d50f77f 100644
--- a/examples/weatherinfo/icons/weather-overcast.png
+++ b/examples/positioning/weatherinfo/icons/weather-overcast.png
diff --git a/examples/weatherinfo/icons/weather-showers.png b/examples/positioning/weatherinfo/icons/weather-showers.png
index 07489aaa..07489aaa 100644
--- a/examples/weatherinfo/icons/weather-showers.png
+++ b/examples/positioning/weatherinfo/icons/weather-showers.png
diff --git a/examples/weatherinfo/icons/weather-sleet.png b/examples/positioning/weatherinfo/icons/weather-sleet.png
index 3d225895..3d225895 100644
--- a/examples/weatherinfo/icons/weather-sleet.png
+++ b/examples/positioning/weatherinfo/icons/weather-sleet.png
diff --git a/examples/weatherinfo/icons/weather-snow.png b/examples/positioning/weatherinfo/icons/weather-snow.png
index e7426e3c..e7426e3c 100644
--- a/examples/weatherinfo/icons/weather-snow.png
+++ b/examples/positioning/weatherinfo/icons/weather-snow.png
diff --git a/examples/weatherinfo/icons/weather-storm.png b/examples/positioning/weatherinfo/icons/weather-storm.png
index 6b6b366a..6b6b366a 100644
--- a/examples/weatherinfo/icons/weather-storm.png
+++ b/examples/positioning/weatherinfo/icons/weather-storm.png
diff --git a/examples/weatherinfo/icons/weather-sunny-very-few-clouds.png b/examples/positioning/weatherinfo/icons/weather-sunny-very-few-clouds.png
index 133bcb29..133bcb29 100644
--- a/examples/weatherinfo/icons/weather-sunny-very-few-clouds.png
+++ b/examples/positioning/weatherinfo/icons/weather-sunny-very-few-clouds.png
diff --git a/examples/weatherinfo/icons/weather-sunny.png b/examples/positioning/weatherinfo/icons/weather-sunny.png
index 0fac921d..0fac921d 100644
--- a/examples/weatherinfo/icons/weather-sunny.png
+++ b/examples/positioning/weatherinfo/icons/weather-sunny.png
diff --git a/examples/weatherinfo/icons/weather-thundershower.png b/examples/positioning/weatherinfo/icons/weather-thundershower.png
index 1aff1639..1aff1639 100644
--- a/examples/weatherinfo/icons/weather-thundershower.png
+++ b/examples/positioning/weatherinfo/icons/weather-thundershower.png
diff --git a/examples/weatherinfo/main.cpp b/examples/positioning/weatherinfo/main.cpp
index 6afcf1c4..6afcf1c4 100644
--- a/examples/weatherinfo/main.cpp
+++ b/examples/positioning/weatherinfo/main.cpp
diff --git a/examples/weatherinfo/weatherinfo.pro b/examples/positioning/weatherinfo/weatherinfo.pro
index 1470b8a0..1470b8a0 100644
--- a/examples/weatherinfo/weatherinfo.pro
+++ b/examples/positioning/weatherinfo/weatherinfo.pro
diff --git a/examples/weatherinfo/weatherinfo.qml b/examples/positioning/weatherinfo/weatherinfo.qml
index 0c69090d..0c69090d 100644
--- a/examples/weatherinfo/weatherinfo.qml
+++ b/examples/positioning/weatherinfo/weatherinfo.qml
diff --git a/examples/weatherinfo/weatherinfo.qrc b/examples/positioning/weatherinfo/weatherinfo.qrc
index 7b79dbea..7b79dbea 100644
--- a/examples/weatherinfo/weatherinfo.qrc
+++ b/examples/positioning/weatherinfo/weatherinfo.qrc
diff --git a/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp
index 113fbde7..5eeab215 100644
--- a/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
     To use the ReviewModel we need a view and a delegate. In this snippet we
     see the setting up of a ListView with a ReviewModel model and a delegate.
 
-    \snippet declarative/places/content/places/PlaceReviews.qml  ReviewModel delegate
+    \snippet places/content/places/PlaceReviews.qml  ReviewModel delegate
 
     The model returns data for the following roles:
 
diff --git a/src/imports/positioning/qdeclarativeposition.cpp b/src/imports/positioning/qdeclarativeposition.cpp
index 51456e02..fa2bd943 100644
--- a/src/imports/positioning/qdeclarativeposition.cpp
+++ b/src/imports/positioning/qdeclarativeposition.cpp
@@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE
     \section2 Example Usage
 
     See the example given for the \l{PositionSource} type, or the
-    \l{declarative/flickr}{Flickr} example application.
+    \l{flickr}{Flickr} example application.
 
     \sa PositionSource, coordinate
 
diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp
index a32557fd..1d1d3a15 100644
--- a/src/imports/positioning/qdeclarativepositionsource.cpp
+++ b/src/imports/positioning/qdeclarativepositionsource.cpp
@@ -107,7 +107,7 @@ QT_BEGIN_NAMESPACE
     }
     \endcode
 
-    The \l{declarative/flickr}{Flickr} example application shows how to use
+    The \l{flickr}{Flickr} example application shows how to use
     a PositionSource in your application to retrieve local data for users
     from a REST web service.
 
diff --git a/src/location/doc/qtlocation.qdocconf b/src/location/doc/qtlocation.qdocconf
index 6abc0ad0..d3ec6693 100644
--- a/src/location/doc/qtlocation.qdocconf
+++ b/src/location/doc/qtlocation.qdocconf
@@ -45,8 +45,9 @@ sourcedirs  += .. \
                 ../../imports/location \
                 ../../plugins/geoservices/nokia
 
-exampledirs += ../../../examples \
-               ../../../examples/declarative \
+examplesinstallpath = location
+
+exampledirs += ../../../examples/location \
                snippets/
 
 
diff --git a/src/location/doc/src/examples/declarative-mapviewer.qdoc b/src/location/doc/src/examples/declarative-mapviewer.qdoc
index ff7ff7db..232b62c9 100644
--- a/src/location/doc/src/examples/declarative-mapviewer.qdoc
+++ b/src/location/doc/src/examples/declarative-mapviewer.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example declarative/mapviewer
+    \example mapviewer
     \title Map Viewer (QML)
     \ingroup qtlocation-examples
 
diff --git a/src/location/doc/src/examples/declarative-places.qdoc b/src/location/doc/src/examples/declarative-places.qdoc
index f73d2bee..1b4b3635 100644
--- a/src/location/doc/src/examples/declarative-places.qdoc
+++ b/src/location/doc/src/examples/declarative-places.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example declarative/places
+    \example places
     \title Places (QML)
     \ingroup qtlocation-examples
 
@@ -78,7 +78,7 @@
     Before search by category can be performed, the list of available categories needs to be
     retrieved.  This is achieved by creating a \l CategoryModel.
 
-    \snippet declarative/places/places.qml CategoryModel model
+    \snippet places/places.qml CategoryModel model
 
     The \l CategoryModel type provides a model of the available categories.  It can provide
     either a flat list or a hierarchical tree model.  In this example, we use a hierarchical tree
@@ -88,11 +88,11 @@
 
     Next we create a view to display the category model.
 
-    \snippet declarative/places/content/places/CategoryView.qml CategoryModel view 1
+    \snippet places/content/places/CategoryView.qml CategoryModel view 1
     \codeline
-    \snippet declarative/places/content/places/CategoryView.qml CategoryModel view 2
+    \snippet places/content/places/CategoryView.qml CategoryModel view 2
     \codeline
-    \snippet declarative/places/content/places/CategoryView.qml CategoryModel view 3
+    \snippet places/content/places/CategoryView.qml CategoryModel view 3
 
     Because a hierarchical model is being used, a \l VisualDataModel is needed to provide
     navigation functionality.  If flat list model was being used the view could use the
@@ -112,14 +112,14 @@
     The \e CategoryDelegate displays the category name and emits the \e clicked signal when
     the text is clicked:
 
-    \snippet declarative/places/content/places/CategoryDelegate.qml CategoryModel delegate text
+    \snippet places/content/places/CategoryDelegate.qml CategoryModel delegate text
 
     The \e CategoryDelegate also displays icons for editing, removing and displaying child
     categories.  These icons are shown as desired when the \e showSave and \e showRemove
     and \e showChildren properties are set and only then in cases where the function is
     supported.
 
-    \snippet declarative/places/content/places/CategoryDelegate.qml CategoryModel delegate icon
+    \snippet places/content/places/CategoryDelegate.qml CategoryModel delegate icon
 
 
     \target Presenting-Search-Suggestions
@@ -130,7 +130,7 @@
 
     A new suggestion search is triggered whenever the entered search term is changed.
 
-    \snippet declarative/places/content/places/SearchBox.qml PlaceSearchSuggestionModel search text changed
+    \snippet places/content/places/SearchBox.qml PlaceSearchSuggestionModel search text changed
 
     The \e suggestionsEnabled property is used to temporarily disable search suggestions when a
     suggestion is selected (selecting it updates the search term text).  Suggestions are only
@@ -140,14 +140,14 @@
     When the status of the \l PlaceSearchSuggestionModel changes, the state of the search box is
     changed to display the search suggestions.
 
-    \snippet declarative/places/content/places/SearchBox.qml PlaceSearchSuggestionModel model
+    \snippet places/content/places/SearchBox.qml PlaceSearchSuggestionModel model
 
     The main object in the "SuggestionsShown" state is the \l ListView showing the search
     suggestions.
 
-    \snippet declarative/places/content/places/SearchBox.qml PlaceSearchSuggestionModel view 1
+    \snippet places/content/places/SearchBox.qml PlaceSearchSuggestionModel view 1
     \codeline
-    \snippet declarative/places/content/places/SearchBox.qml PlaceSearchSuggestionModel view 2
+    \snippet places/content/places/SearchBox.qml PlaceSearchSuggestionModel view 2
 
     A \l Text object is used as the delegate to display the suggestion text.  Clicking on the
     suggested search term updates the search term and triggers a place search using the search
@@ -158,7 +158,7 @@
 
     The \l PlaceSearchModel type is used to search for places.
 
-    \snippet declarative/places/places.qml PlaceSearchModel model
+    \snippet places/places.qml PlaceSearchModel model
 
     First some of the model's properties are set, which will be used to form the search request.
     The \l {PlaceSearchModel::searchArea}{searchArea} property is set to the
@@ -171,13 +171,13 @@
     \l {PlaceSearchModel::update()}{update()} method to start the place search.  The search
     results are displayed in a \l ListView.
 
-    \snippet declarative/places/content/places/SearchResultView.qml PlaceSearchModel place list
+    \snippet places/content/places/SearchResultView.qml PlaceSearchModel place list
 
     The delegate used in the \l ListView, \e SearchResultDelegate, is designed to handle multiple
     search result types via a \l Loader object.  For results of type \e PlaceResult the delegate
     is:
 
-    \snippet declarative/places/content/places/SearchResultDelegate.qml PlaceSearchModel place delegate
+    \snippet places/content/places/SearchResultDelegate.qml PlaceSearchModel place delegate
 
     \section1 Displaying Place Content
 
@@ -187,7 +187,7 @@
     \l {Place::editorialModel}{editorialModel}, \l {Place::reviewModel}{reviewModel} and
     \l {Place::imageModel}{imageModel} properties of the \l Place type.
 
-    \snippet declarative/places/content/places/PlaceEditorials.qml PlaceEditorialModel view
+    \snippet places/content/places/PlaceEditorials.qml PlaceEditorialModel view
 
 
     \section1 Place and Category Creation
@@ -199,11 +199,11 @@
     \l {Qt::createQmlObject()}{Qt.createQmlObject()} method.  Assign the appropriate plugin and
     place properties and invoke the \l {Place::save()}{save()} method.
 
-    \snippet declarative/places/content/places/PlaceDialog.qml Place save
+    \snippet places/content/places/PlaceDialog.qml Place save
 
     Category creation is similar:
 
-    \snippet declarative/places/content/places/CategoryDialog.qml Category save
+    \snippet places/content/places/CategoryDialog.qml Category save
 
     Support for place and category removal can be checked at run-time by using the
     \l {Plugin::supportsPlaces} method, passing in a \l {Plugin::supportsPlaces}{Plugin::PlacesFeatures} flag and
diff --git a/src/location/doc/src/examples/places-list.qdoc b/src/location/doc/src/examples/places-list.qdoc
index 79f17f25..7c7e6408 100644
--- a/src/location/doc/src/examples/places-list.qdoc
+++ b/src/location/doc/src/examples/places-list.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example declarative/places_list
+    \example places_list
     \title Places List (QML)
     \ingroup qtlocation-examples
 
diff --git a/src/location/doc/src/examples/places-map.qdoc b/src/location/doc/src/examples/places-map.qdoc
index 1f34597f..100f030e 100644
--- a/src/location/doc/src/examples/places-map.qdoc
+++ b/src/location/doc/src/examples/places-map.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example declarative/places_map
+    \example places_map
     \title Places Map (QML)
     \ingroup qtlocation-examples
 
diff --git a/src/positioning/doc/qtpositioning.qdocconf b/src/positioning/doc/qtpositioning.qdocconf
index 14679477..10e7b19f 100644
--- a/src/positioning/doc/qtpositioning.qdocconf
+++ b/src/positioning/doc/qtpositioning.qdocconf
@@ -44,8 +44,9 @@ headerdirs  += .. \
 sourcedirs  += .. \
                 ../../imports/positioning
 
-exampledirs += ../../../examples \
-               ../../../examples/declarative \
+examplesinstallpath = positioning
+
+exampledirs += ../../../examples/positioning \
                snippets/
 
 
diff --git a/src/positioning/doc/src/examples/declarative-flickr.qdoc b/src/positioning/doc/src/examples/declarative-flickr.qdoc
index 46cc8d22..af8f4680 100644
--- a/src/positioning/doc/src/examples/declarative-flickr.qdoc
+++ b/src/positioning/doc/src/examples/declarative-flickr.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example declarative/flickr
+    \example flickr
     \title Flickr (QML)
     \ingroup qtpositioning-examples