diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2010-05-26 11:28:42 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2010-05-26 11:28:42 (GMT) |
| commit | f2d6af86383cfd9d5344673f4c755f06b900fa46 (patch) | |
| tree | a00711f73c644f59523899627d309fd8665ca07c /examples/declarative/modelviews | |
| parent | 70ae881499ec329e6fdf96d56a6189f77641b3b0 (diff) | |
| parent | 39b861b75566c4db0db3b5aba2aa191a59f10bdb (diff) | |
| download | Qt-f2d6af86383cfd9d5344673f4c755f06b900fa46.zip Qt-f2d6af86383cfd9d5344673f4c755f06b900fa46.tar.gz Qt-f2d6af86383cfd9d5344673f4c755f06b900fa46.tar.bz2 | |
Merge branch '4.7' of scm.dev.troll.no:qt/qt into 4.7
Conflicts:
src/gui/kernel/qapplication_s60.cpp
Diffstat (limited to 'examples/declarative/modelviews')
| -rwxr-xr-x | examples/declarative/modelviews/webview/content/Mapping/map.html | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/examples/declarative/modelviews/webview/content/Mapping/map.html b/examples/declarative/modelviews/webview/content/Mapping/map.html index a8726fd..a98da54 100755 --- a/examples/declarative/modelviews/webview/content/Mapping/map.html +++ b/examples/declarative/modelviews/webview/content/Mapping/map.html @@ -25,6 +25,14 @@ } else { goToLatLng(new google.maps.LatLng(window.qml.lat,window.qml.lng)); } + if (navigator.geolocation) { + navigator.geolocation.getCurrentPosition(function(position) { + initialLocation = new google.maps.LatLng(position.coords.latitude,position.coords.longitude); + window.qml.lat = initialLocation.lat; + window.qml.lng = initialLocation.lng; + goToLatLng(initialLocation); + }); + } } function goToAddress() { if (geocoder) { |