diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-16 03:01:14 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-16 03:01:14 +0100 |
commit | 7207586f1a159d6e23351442eb313fe3cb778ad0 (patch) | |
tree | 0326f4be05a6e48510e61ad6ece9a7b9cfbeabc4 /examples/quickcontrols2/wearable/qml/Weather | |
parent | 9aa58e6da8487fab2e5f13795255adf0371aabe1 (diff) | |
parent | cb182fb50e49fa88f7bf33f2407447167fd8048f (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I647fa31fafdaea46c341c515f97b7f793ddf4b31
Diffstat (limited to 'examples/quickcontrols2/wearable/qml/Weather')
24 files changed, 0 insertions, 0 deletions
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark.png b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark.png Binary files differindex 6baaefda..5d82238c 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark@2x.png Binary files differindex 7060c48d..d83bb4f0 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark@2x.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light.png b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light.png Binary files differindex ef9ed9de..5f3bf714 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light@2x.png Binary files differindex 5c367a3e..a23364c5 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light@2x.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark.png b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark.png Binary files differindex 2038c695..b2870a55 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark@2x.png Binary files differindex 9b5a4abe..061f9b82 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark@2x.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light.png b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light.png Binary files differindex 7850609e..7b1b1587 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light@2x.png Binary files differindex 14c1cab3..1a40c642 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light@2x.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark.png Binary files differindex 5a70f984..9cac22e1 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark@2x.png Binary files differindex 2baa7135..fe326823 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark@2x.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light.png Binary files differindex 70a9a969..f67a5dff 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light@2x.png Binary files differindex 3a7892eb..86f54837 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light@2x.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark.png Binary files differindex 5dde7c0f..0068d305 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark@2x.png Binary files differindex 3892c2ea..e515bcc3 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark@2x.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light.png Binary files differindex 01bb9ec8..495f78a7 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light@2x.png Binary files differindex 39aeebe5..d220e829 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light@2x.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark.png b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark.png Binary files differindex 1c86bae2..a207d944 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark@2x.png Binary files differindex c1ac7d66..c0e4ef39 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark@2x.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light.png b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light.png Binary files differindex 5d7faa99..c4f7b61c 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light@2x.png Binary files differindex 0b4340ce..50d4f4c4 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light@2x.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark.png b/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark.png Binary files differindex 4e5264a3..6a530491 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark@2x.png Binary files differindex 0a893d50..487e3e78 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark@2x.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/wind-light.png b/examples/quickcontrols2/wearable/qml/Weather/images/wind-light.png Binary files differindex c728fcc0..97824bee 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/wind-light.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/wind-light.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/wind-light@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/wind-light@2x.png Binary files differindex bab49c04..7f94bd85 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/wind-light@2x.png +++ b/examples/quickcontrols2/wearable/qml/Weather/images/wind-light@2x.png |