diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-30 13:46:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-30 13:46:40 +0200 |
| commit | c3cc73e3087db62a8427ff569abff1a8289dae83 (patch) | |
| tree | 9839a823f220f57775a732658b8aab0fa4ba9be3 /examples/quickcontrols2/wearable/qml/Weather/weather.json | |
| parent | 2e0cded94716430658d4afe3e0fdd6fe4cf6362c (diff) | |
| parent | bc514fba81b67afb41ee91ea917352ad674630a5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/RangeSlider.qml
Change-Id: I0b930583135f044cb690217c026e6a120b73fcb7
Diffstat (limited to 'examples/quickcontrols2/wearable/qml/Weather/weather.json')
| -rw-r--r-- | examples/quickcontrols2/wearable/qml/Weather/weather.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/quickcontrols2/wearable/qml/Weather/weather.json b/examples/quickcontrols2/wearable/qml/Weather/weather.json new file mode 100644 index 00000000..2cce95c6 --- /dev/null +++ b/examples/quickcontrols2/wearable/qml/Weather/weather.json @@ -0,0 +1 @@ +{"coord":{"lon":-122.42,"lat":37.77},"weather":[{"id":803,"main":"Clouds","description":"broken clouds","icon":"04n"}],"base":"stations","main":{"temp":45.22,"pressure":1020.17,"humidity":88,"temp_min":36.92,"temp_max":58.92,"sea_level":1028.19,"grnd_level":1020.17},"wind":{"speed":6.73,"deg":201.002},"clouds":{"all":68},"dt":1476412232,"sys":{"message":0.012,"country":"US","sunrise":1476454666,"sunset":1476495156},"id":5391959,"name":"San Francisco","cod":200} |