diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2013-11-18 10:24:19 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-18 11:53:15 +0100 |
commit | 02e88e8349b4c516c855f2f373838a29e9d3e1bb (patch) | |
tree | d439538d57af42be14e22377d347eebdc3973dae | |
parent | 898f292736ced9ae83e7fad2da3006196dfaa8c7 (diff) | |
download | qtlocation-02e88e8349b4c516c855f2f373838a29e9d3e1bb.tar.gz |
Reorder example dir structure according to Qt convention
Causes undesirable example structure in Qt release package
Task-number: QTBUG-34907
Change-Id: I47e2205aa6faef388792146b36cf6ae6cae863da
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r-- | examples/declarative/declarative.pro | 8 | ||||
-rw-r--r-- | examples/examples.pro | 8 | ||||
-rw-r--r-- | examples/location/common/common.pri (renamed from examples/declarative/common/common.pri) | 0 | ||||
-rw-r--r-- | examples/location/common/common.qrc (renamed from examples/declarative/common/common.qrc) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/components/BusyIndicator.qml (renamed from examples/declarative/common/imports/QtLocation/examples/components/BusyIndicator.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/components/Button.qml (renamed from examples/declarative/common/imports/QtLocation/examples/components/Button.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/components/Checkbox.qml (renamed from examples/declarative/common/imports/QtLocation/examples/components/Checkbox.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/components/Fader.qml (renamed from examples/declarative/common/imports/QtLocation/examples/components/Fader.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/components/IconButton.qml (renamed from examples/declarative/common/imports/QtLocation/examples/components/IconButton.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/components/Menu.qml (renamed from examples/declarative/common/imports/QtLocation/examples/components/Menu.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/components/Optionbutton.qml (renamed from examples/declarative/common/imports/QtLocation/examples/components/Optionbutton.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/components/Slider.qml (renamed from examples/declarative/common/imports/QtLocation/examples/components/Slider.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/components/TextWithLabel.qml (renamed from examples/declarative/common/imports/QtLocation/examples/components/TextWithLabel.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/components/TitleBar.qml (renamed from examples/declarative/common/imports/QtLocation/examples/components/TitleBar.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/components/style/ButtonStyle.qml (renamed from examples/declarative/common/imports/QtLocation/examples/components/style/ButtonStyle.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/components/style/HMenuItemStyle.qml (renamed from examples/declarative/common/imports/QtLocation/examples/components/style/HMenuItemStyle.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/components/style/VMenuItemStyle.qml (renamed from examples/declarative/common/imports/QtLocation/examples/components/style/VMenuItemStyle.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/dialogs/Dialog.qml (renamed from examples/declarative/common/imports/QtLocation/examples/dialogs/Dialog.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/dialogs/ErrorDialog.qml (renamed from examples/declarative/common/imports/QtLocation/examples/dialogs/ErrorDialog.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/dialogs/InputDialog.qml (renamed from examples/declarative/common/imports/QtLocation/examples/dialogs/InputDialog.qml) | 0 | ||||
-rw-r--r-- | examples/location/common/imports/QtLocation/examples/qmldir (renamed from examples/declarative/common/imports/QtLocation/examples/qmldir) | 0 | ||||
-rwxr-xr-x | examples/location/common/resources/busy.png (renamed from examples/declarative/common/resources/busy.png) | bin | 2921 -> 2921 bytes | |||
-rw-r--r-- | examples/location/common/resources/button.png (renamed from examples/declarative/common/resources/button.png) | bin | 666 -> 666 bytes | |||
-rw-r--r-- | examples/location/common/resources/button_pressed.png (renamed from examples/declarative/common/resources/button_pressed.png) | bin | 563 -> 563 bytes | |||
-rw-r--r-- | examples/location/common/resources/catch.png (renamed from examples/declarative/common/resources/catch.png) | bin | 530 -> 530 bytes | |||
-rw-r--r-- | examples/location/common/resources/categories.png (renamed from examples/declarative/common/resources/categories.png) | bin | 255 -> 255 bytes | |||
-rw-r--r-- | examples/location/common/resources/categories_pressed.png (renamed from examples/declarative/common/resources/categories_pressed.png) | bin | 255 -> 255 bytes | |||
-rw-r--r-- | examples/location/common/resources/checkbox.png (renamed from examples/declarative/common/resources/checkbox.png) | bin | 410 -> 410 bytes | |||
-rw-r--r-- | examples/location/common/resources/checkbox_selected.png (renamed from examples/declarative/common/resources/checkbox_selected.png) | bin | 755 -> 755 bytes | |||
-rw-r--r-- | examples/location/common/resources/cross.png (renamed from examples/declarative/common/resources/cross.png) | bin | 1514 -> 1514 bytes | |||
-rw-r--r-- | examples/location/common/resources/cross_hovered.png (renamed from examples/declarative/common/resources/cross_hovered.png) | bin | 1579 -> 1579 bytes | |||
-rw-r--r-- | examples/location/common/resources/cross_pressed.png (renamed from examples/declarative/common/resources/cross_pressed.png) | bin | 1556 -> 1556 bytes | |||
-rw-r--r-- | examples/location/common/resources/hmenuItem.png (renamed from examples/declarative/common/resources/hmenuItem.png) | bin | 244 -> 244 bytes | |||
-rw-r--r-- | examples/location/common/resources/hmenuItem_pressed.png (renamed from examples/declarative/common/resources/hmenuItem_pressed.png) | bin | 600 -> 600 bytes | |||
-rw-r--r-- | examples/location/common/resources/left.png (renamed from examples/declarative/common/resources/left.png) | bin | 290 -> 290 bytes | |||
-rw-r--r-- | examples/location/common/resources/left_pressed.png (renamed from examples/declarative/common/resources/left_pressed.png) | bin | 2860 -> 2860 bytes | |||
-rw-r--r-- | examples/location/common/resources/marker.png (renamed from examples/declarative/common/resources/marker.png) | bin | 2341 -> 2341 bytes | |||
-rw-r--r-- | examples/location/common/resources/marker_hovered.png (renamed from examples/declarative/common/resources/marker_hovered.png) | bin | 2358 -> 2358 bytes | |||
-rw-r--r-- | examples/location/common/resources/marker_selected.png (renamed from examples/declarative/common/resources/marker_selected.png) | bin | 2355 -> 2355 bytes | |||
-rw-r--r-- | examples/location/common/resources/node.png (renamed from examples/declarative/common/resources/node.png) | bin | 432 -> 432 bytes | |||
-rw-r--r-- | examples/location/common/resources/node_selected.png (renamed from examples/declarative/common/resources/node_selected.png) | bin | 458 -> 458 bytes | |||
-rw-r--r-- | examples/location/common/resources/option_button.png (renamed from examples/declarative/common/resources/option_button.png) | bin | 777 -> 777 bytes | |||
-rw-r--r-- | examples/location/common/resources/option_button_selected.png (renamed from examples/declarative/common/resources/option_button_selected.png) | bin | 654 -> 654 bytes | |||
-rw-r--r-- | examples/location/common/resources/pencil.png (renamed from examples/declarative/common/resources/pencil.png) | bin | 1276 -> 1276 bytes | |||
-rw-r--r-- | examples/location/common/resources/pencil_hovered.png (renamed from examples/declarative/common/resources/pencil_hovered.png) | bin | 1201 -> 1201 bytes | |||
-rw-r--r-- | examples/location/common/resources/pencil_pressed.png (renamed from examples/declarative/common/resources/pencil_pressed.png) | bin | 1159 -> 1159 bytes | |||
-rw-r--r-- | examples/location/common/resources/quit.png (renamed from examples/declarative/common/resources/quit.png) | bin | 2439 -> 2439 bytes | |||
-rw-r--r-- | examples/location/common/resources/quit_hovered.png (renamed from examples/declarative/common/resources/quit_hovered.png) | bin | 2702 -> 2702 bytes | |||
-rw-r--r-- | examples/location/common/resources/quit_pressed.png (renamed from examples/declarative/common/resources/quit_pressed.png) | bin | 2396 -> 2396 bytes | |||
-rw-r--r-- | examples/location/common/resources/right.png (renamed from examples/declarative/common/resources/right.png) | bin | 302 -> 302 bytes | |||
-rw-r--r-- | examples/location/common/resources/right_pressed.png (renamed from examples/declarative/common/resources/right_pressed.png) | bin | 2849 -> 2849 bytes | |||
-rw-r--r-- | examples/location/common/resources/scale.png (renamed from examples/declarative/common/resources/scale.png) | bin | 176 -> 176 bytes | |||
-rw-r--r-- | examples/location/common/resources/scale_end.png (renamed from examples/declarative/common/resources/scale_end.png) | bin | 208 -> 208 bytes | |||
-rw-r--r-- | examples/location/common/resources/search.png (renamed from examples/declarative/common/resources/search.png) | bin | 442 -> 442 bytes | |||
-rw-r--r-- | examples/location/common/resources/search_pressed.png (renamed from examples/declarative/common/resources/search_pressed.png) | bin | 490 -> 490 bytes | |||
-rw-r--r-- | examples/location/common/resources/star.png (renamed from examples/declarative/common/resources/star.png) | bin | 4204 -> 4204 bytes | |||
-rw-r--r-- | examples/location/common/resources/titlebar.png (renamed from examples/declarative/common/resources/titlebar.png) | bin | 889 -> 889 bytes | |||
-rw-r--r-- | examples/location/common/resources/titlebar.sci (renamed from examples/declarative/common/resources/titlebar.sci) | 0 | ||||
-rw-r--r-- | examples/location/common/resources/vmenuItem.png (renamed from examples/declarative/common/resources/vmenuItem.png) | bin | 224 -> 224 bytes | |||
-rw-r--r-- | examples/location/location.pro | 9 | ||||
-rw-r--r-- | examples/location/mapviewer/content/dialogs/Message.qml (renamed from examples/declarative/mapviewer/content/dialogs/Message.qml) | 0 | ||||
-rw-r--r-- | examples/location/mapviewer/content/dialogs/RouteDialog.qml (renamed from examples/declarative/mapviewer/content/dialogs/RouteDialog.qml) | 0 | ||||
-rw-r--r-- | examples/location/mapviewer/content/map/3dItem.qml (renamed from examples/declarative/mapviewer/content/map/3dItem.qml) | 0 | ||||
-rw-r--r-- | examples/location/mapviewer/content/map/CircleItem.qml (renamed from examples/declarative/mapviewer/content/map/CircleItem.qml) | 0 | ||||
-rw-r--r-- | examples/location/mapviewer/content/map/ImageItem.qml (renamed from examples/declarative/mapviewer/content/map/ImageItem.qml) | 0 | ||||
-rw-r--r-- | examples/location/mapviewer/content/map/MapComponent.qml (renamed from examples/declarative/mapviewer/content/map/MapComponent.qml) | 0 | ||||
-rw-r--r-- | examples/location/mapviewer/content/map/Marker.qml (renamed from examples/declarative/mapviewer/content/map/Marker.qml) | 0 | ||||
-rw-r--r-- | examples/location/mapviewer/content/map/MiniMap.qml (renamed from examples/declarative/mapviewer/content/map/MiniMap.qml) | 0 | ||||
-rw-r--r-- | examples/location/mapviewer/content/map/PolygonItem.qml (renamed from examples/declarative/mapviewer/content/map/PolygonItem.qml) | 0 | ||||
-rw-r--r-- | examples/location/mapviewer/content/map/PolylineItem.qml (renamed from examples/declarative/mapviewer/content/map/PolylineItem.qml) | 0 | ||||
-rw-r--r-- | examples/location/mapviewer/content/map/RectangleItem.qml (renamed from examples/declarative/mapviewer/content/map/RectangleItem.qml) | 0 | ||||
-rw-r--r-- | examples/location/mapviewer/content/map/VideoItem.qml (renamed from examples/declarative/mapviewer/content/map/VideoItem.qml) | 0 | ||||
-rw-r--r-- | examples/location/mapviewer/demo.ogv (renamed from examples/declarative/mapviewer/demo.ogv) | bin | 642306 -> 642306 bytes | |||
-rw-r--r-- | examples/location/mapviewer/icon.png (renamed from examples/declarative/mapviewer/icon.png) | bin | 5312 -> 5312 bytes | |||
-rw-r--r-- | examples/location/mapviewer/mapviewer.pro (renamed from examples/declarative/mapviewer/mapviewer.pro) | 0 | ||||
-rw-r--r-- | examples/location/mapviewer/mapviewer.qml (renamed from examples/declarative/mapviewer/mapviewer.qml) | 0 | ||||
-rw-r--r-- | examples/location/mapviewer/mapviewerwrapper.qrc (renamed from examples/declarative/mapviewer/mapviewerwrapper.qrc) | 0 | ||||
-rw-r--r-- | examples/location/mapviewer/qmlmapviewerwrapper.cpp (renamed from examples/declarative/mapviewer/qmlmapviewerwrapper.cpp) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/CategoryDelegate.qml (renamed from examples/declarative/places/content/places/CategoryDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/CategoryDialog.qml (renamed from examples/declarative/places/content/places/CategoryDialog.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/CategoryView.qml (renamed from examples/declarative/places/content/places/CategoryView.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/EditorialDelegate.qml (renamed from examples/declarative/places/content/places/EditorialDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/EditorialPage.qml (renamed from examples/declarative/places/content/places/EditorialPage.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/Group.qml (renamed from examples/declarative/places/content/places/Group.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/MapComponent.qml (renamed from examples/declarative/places/content/places/MapComponent.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/OptionsDialog.qml (renamed from examples/declarative/places/content/places/OptionsDialog.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/PlaceDelegate.qml (renamed from examples/declarative/places/content/places/PlaceDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/PlaceDialog.qml (renamed from examples/declarative/places/content/places/PlaceDialog.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/PlaceEditorials.qml (renamed from examples/declarative/places/content/places/PlaceEditorials.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/PlaceImages.qml (renamed from examples/declarative/places/content/places/PlaceImages.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/PlaceReviews.qml (renamed from examples/declarative/places/content/places/PlaceReviews.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/PlacesUtils.js (renamed from examples/declarative/places/content/places/PlacesUtils.js) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/RatingView.qml (renamed from examples/declarative/places/content/places/RatingView.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/ReviewDelegate.qml (renamed from examples/declarative/places/content/places/ReviewDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/ReviewPage.qml (renamed from examples/declarative/places/content/places/ReviewPage.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/SearchBox.qml (renamed from examples/declarative/places/content/places/SearchBox.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/SearchResultDelegate.qml (renamed from examples/declarative/places/content/places/SearchResultDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/content/places/SearchResultView.qml (renamed from examples/declarative/places/content/places/SearchResultView.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/icon.png (renamed from examples/declarative/places/icon.png) | bin | 5312 -> 5312 bytes | |||
-rw-r--r-- | examples/location/places/places.pro (renamed from examples/declarative/places/places.pro) | 0 | ||||
-rw-r--r-- | examples/location/places/places.qml (renamed from examples/declarative/places/places.qml) | 0 | ||||
-rw-r--r-- | examples/location/places/placeswrapper.qrc (renamed from examples/declarative/places/placeswrapper.qrc) | 0 | ||||
-rw-r--r-- | examples/location/places/qmlplaceswrapper.cpp (renamed from examples/declarative/places/qmlplaceswrapper.cpp) | 0 | ||||
-rw-r--r-- | examples/location/places_list/main.cpp (renamed from examples/declarative/places_list/main.cpp) | 0 | ||||
-rw-r--r-- | examples/location/places_list/places_list.pro (renamed from examples/declarative/places_list/places_list.pro) | 0 | ||||
-rw-r--r-- | examples/location/places_list/places_list.qml (renamed from examples/declarative/places_list/places_list.qml) | 0 | ||||
-rw-r--r-- | examples/location/places_map/main.cpp (renamed from examples/declarative/places_map/main.cpp) | 0 | ||||
-rw-r--r-- | examples/location/places_map/marker.png (renamed from examples/declarative/places_map/marker.png) | bin | 2341 -> 2341 bytes | |||
-rw-r--r-- | examples/location/places_map/places_map.pro (renamed from examples/declarative/places_map/places_map.pro) | 0 | ||||
-rw-r--r-- | examples/location/places_map/places_map.qml (renamed from examples/declarative/places_map/places_map.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickr-90.qml (renamed from examples/declarative/flickr/flickr-90.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickr.pro (renamed from examples/declarative/flickr/flickr.pro) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickr.qml (renamed from examples/declarative/flickr/flickr.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickr.qmlproject (renamed from examples/declarative/flickr/flickr.qmlproject) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickr.qrc (renamed from examples/declarative/flickr/flickr.qrc) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickrcommon/Progress.qml (renamed from examples/declarative/flickr/flickrcommon/Progress.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickrcommon/RestModel.qml (renamed from examples/declarative/flickr/flickrcommon/RestModel.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickrcommon/ScrollBar.qml (renamed from examples/declarative/flickr/flickrcommon/ScrollBar.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickrcommon/Slider.qml (renamed from examples/declarative/flickr/flickrcommon/Slider.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/Button.qml (renamed from examples/declarative/flickr/flickrmobile/Button.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/GeoTab.qml (renamed from examples/declarative/flickr/flickrmobile/GeoTab.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/GridDelegate.qml (renamed from examples/declarative/flickr/flickrmobile/GridDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/ImageDetails.qml (renamed from examples/declarative/flickr/flickrmobile/ImageDetails.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/ListDelegate.qml (renamed from examples/declarative/flickr/flickrmobile/ListDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/TitleBar.qml (renamed from examples/declarative/flickr/flickrmobile/TitleBar.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/ToolBar.qml (renamed from examples/declarative/flickr/flickrmobile/ToolBar.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/images/gloss.png (renamed from examples/declarative/flickr/flickrmobile/images/gloss.png) | bin | 1236 -> 1236 bytes | |||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/images/lineedit.png (renamed from examples/declarative/flickr/flickrmobile/images/lineedit.png) | bin | 1415 -> 1415 bytes | |||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/images/lineedit.sci (renamed from examples/declarative/flickr/flickrmobile/images/lineedit.sci) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/images/moon.png (renamed from examples/declarative/flickr/flickrmobile/images/moon.png) | bin | 2433 -> 2433 bytes | |||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/images/quit.png (renamed from examples/declarative/flickr/flickrmobile/images/quit.png) | bin | 2369 -> 2369 bytes | |||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/images/star.png (renamed from examples/declarative/flickr/flickrmobile/images/star.png) | bin | 349 -> 349 bytes | |||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/images/stripes.png (renamed from examples/declarative/flickr/flickrmobile/images/stripes.png) | bin | 257 -> 257 bytes | |||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/images/sun.png (renamed from examples/declarative/flickr/flickrmobile/images/sun.png) | bin | 8153 -> 8153 bytes | |||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/images/titlebar.png (renamed from examples/declarative/flickr/flickrmobile/images/titlebar.png) | bin | 1436 -> 1436 bytes | |||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/images/titlebar.sci (renamed from examples/declarative/flickr/flickrmobile/images/titlebar.sci) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/images/toolbutton.png (renamed from examples/declarative/flickr/flickrmobile/images/toolbutton.png) | bin | 2550 -> 2550 bytes | |||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/images/toolbutton.sci (renamed from examples/declarative/flickr/flickrmobile/images/toolbutton.sci) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/flickrmobile/nmealog.txt (renamed from examples/declarative/flickr/flickrmobile/nmealog.txt) | 0 | ||||
-rw-r--r-- | examples/positioning/flickr/qmllocationflickr.cpp (renamed from examples/declarative/flickr/qmllocationflickr.cpp) | 0 | ||||
-rw-r--r-- | examples/positioning/logfilepositionsource/clientapplication.cpp (renamed from examples/logfilepositionsource/clientapplication.cpp) | 0 | ||||
-rw-r--r-- | examples/positioning/logfilepositionsource/clientapplication.h (renamed from examples/logfilepositionsource/clientapplication.h) | 0 | ||||
-rw-r--r-- | examples/positioning/logfilepositionsource/logfilepositionsource.cpp (renamed from examples/logfilepositionsource/logfilepositionsource.cpp) | 0 | ||||
-rw-r--r-- | examples/positioning/logfilepositionsource/logfilepositionsource.h (renamed from examples/logfilepositionsource/logfilepositionsource.h) | 0 | ||||
-rw-r--r-- | examples/positioning/logfilepositionsource/logfilepositionsource.pro (renamed from examples/logfilepositionsource/logfilepositionsource.pro) | 0 | ||||
-rw-r--r-- | examples/positioning/logfilepositionsource/main.cpp (renamed from examples/logfilepositionsource/main.cpp) | 0 | ||||
-rw-r--r-- | examples/positioning/logfilepositionsource/simplelog.txt (renamed from examples/logfilepositionsource/simplelog.txt) | 0 | ||||
-rw-r--r-- | examples/positioning/positioning.pro | 4 | ||||
-rw-r--r-- | examples/positioning/weatherinfo/appmodel.cpp (renamed from examples/weatherinfo/appmodel.cpp) | 0 | ||||
-rw-r--r-- | examples/positioning/weatherinfo/appmodel.h (renamed from examples/weatherinfo/appmodel.h) | 0 | ||||
-rw-r--r-- | examples/positioning/weatherinfo/components/BigForecastIcon.qml (renamed from examples/weatherinfo/components/BigForecastIcon.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/weatherinfo/components/ForecastIcon.qml (renamed from examples/weatherinfo/components/ForecastIcon.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/weatherinfo/components/WeatherIcon.qml (renamed from examples/weatherinfo/components/WeatherIcon.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/weatherinfo/icons/README.txt (renamed from examples/weatherinfo/icons/README.txt) | 0 | ||||
-rw-r--r-- | examples/positioning/weatherinfo/icons/weather-few-clouds.png (renamed from examples/weatherinfo/icons/weather-few-clouds.png) | bin | 79488 -> 79488 bytes | |||
-rw-r--r-- | examples/positioning/weatherinfo/icons/weather-fog.png (renamed from examples/weatherinfo/icons/weather-fog.png) | bin | 43896 -> 43896 bytes | |||
-rw-r--r-- | examples/positioning/weatherinfo/icons/weather-haze.png (renamed from examples/weatherinfo/icons/weather-haze.png) | bin | 130030 -> 130030 bytes | |||
-rw-r--r-- | examples/positioning/weatherinfo/icons/weather-icy.png (renamed from examples/weatherinfo/icons/weather-icy.png) | bin | 49362 -> 49362 bytes | |||
-rw-r--r-- | examples/positioning/weatherinfo/icons/weather-overcast.png (renamed from examples/weatherinfo/icons/weather-overcast.png) | bin | 60290 -> 60290 bytes | |||
-rw-r--r-- | examples/positioning/weatherinfo/icons/weather-showers.png (renamed from examples/weatherinfo/icons/weather-showers.png) | bin | 76340 -> 76340 bytes | |||
-rw-r--r-- | examples/positioning/weatherinfo/icons/weather-sleet.png (renamed from examples/weatherinfo/icons/weather-sleet.png) | bin | 87168 -> 87168 bytes | |||
-rw-r--r-- | examples/positioning/weatherinfo/icons/weather-snow.png (renamed from examples/weatherinfo/icons/weather-snow.png) | bin | 70939 -> 70939 bytes | |||
-rw-r--r-- | examples/positioning/weatherinfo/icons/weather-storm.png (renamed from examples/weatherinfo/icons/weather-storm.png) | bin | 93207 -> 93207 bytes | |||
-rw-r--r-- | examples/positioning/weatherinfo/icons/weather-sunny-very-few-clouds.png (renamed from examples/weatherinfo/icons/weather-sunny-very-few-clouds.png) | bin | 65731 -> 65731 bytes | |||
-rw-r--r-- | examples/positioning/weatherinfo/icons/weather-sunny.png (renamed from examples/weatherinfo/icons/weather-sunny.png) | bin | 59084 -> 59084 bytes | |||
-rw-r--r-- | examples/positioning/weatherinfo/icons/weather-thundershower.png (renamed from examples/weatherinfo/icons/weather-thundershower.png) | bin | 105643 -> 105643 bytes | |||
-rw-r--r-- | examples/positioning/weatherinfo/main.cpp (renamed from examples/weatherinfo/main.cpp) | 0 | ||||
-rw-r--r-- | examples/positioning/weatherinfo/weatherinfo.pro (renamed from examples/weatherinfo/weatherinfo.pro) | 0 | ||||
-rw-r--r-- | examples/positioning/weatherinfo/weatherinfo.qml (renamed from examples/weatherinfo/weatherinfo.qml) | 0 | ||||
-rw-r--r-- | examples/positioning/weatherinfo/weatherinfo.qrc (renamed from examples/weatherinfo/weatherinfo.qrc) | 0 |
170 files changed, 17 insertions, 12 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/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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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..7ae7b4dc 100644 --- a/examples/declarative/mapviewer/mapviewer.pro +++ b/examples/location/mapviewer/mapviewer.pro 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 Binary files differindex 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..ab9b1547 100644 --- a/examples/declarative/places/places.pro +++ b/examples/location/places/places.pro 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/declarative/places_list/places_list.pro b/examples/location/places_list/places_list.pro index 238e2973..238e2973 100644 --- a/examples/declarative/places_list/places_list.pro +++ b/examples/location/places_list/places_list.pro 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 Binary files differindex 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..34f5ad92 100644 --- a/examples/declarative/places_map/places_map.pro +++ b/examples/location/places_map/places_map.pro 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..ff83bcb2 100644 --- a/examples/declarative/flickr/flickr.pro +++ b/examples/positioning/flickr/flickr.pro 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 |