diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:14 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:14 +0200 |
commit | 46bef1bf9b00727832cad35440c554f26e7457b9 (patch) | |
tree | 2481297c25d1a8f4b648fc9368166c925804d22f /examples/location/mapviewer | |
parent | e176f25daeb3d80af1fd701000fda065064227e1 (diff) | |
parent | d1f66746ab0b77b4f3300cbeeaafe61d25d78e98 (diff) | |
download | qtlocation-46bef1bf9b00727832cad35440c554f26e7457b9.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I9e85d2002151f7c53d2edbb4d8a078816aff693e
Diffstat (limited to 'examples/location/mapviewer')
-rw-r--r-- | examples/location/mapviewer/resources/marker.png | bin | 1051 -> 752 bytes |
-rw-r--r-- | examples/location/mapviewer/resources/scale.png | bin | 176 -> 98 bytes |
-rw-r--r-- | examples/location/mapviewer/resources/scale_end.png | bin | 208 -> 93 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/examples/location/mapviewer/resources/marker.png b/examples/location/mapviewer/resources/marker.png Binary files differindex d5c698d1..2116dfdf 100644 --- a/examples/location/mapviewer/resources/marker.png +++ b/examples/location/mapviewer/resources/marker.png diff --git a/examples/location/mapviewer/resources/scale.png b/examples/location/mapviewer/resources/scale.png Binary files differindex 6e59ff08..c4f08122 100644 --- a/examples/location/mapviewer/resources/scale.png +++ b/examples/location/mapviewer/resources/scale.png diff --git a/examples/location/mapviewer/resources/scale_end.png b/examples/location/mapviewer/resources/scale_end.png Binary files differindex 5d3a471b..94510b12 100644 --- a/examples/location/mapviewer/resources/scale_end.png +++ b/examples/location/mapviewer/resources/scale_end.png |