diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-14 10:25:01 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-14 10:27:21 +0300 |
commit | 97863a4992276a3d1aeb3c1bb9ef5a280a5e8b12 (patch) | |
tree | b38f6f152e7036b91c25834a917e320955660db2 /basicsuite/ebike-ui/images | |
parent | 8be609623fc646e8d9642fc8481a1b9e59fb8417 (diff) | |
parent | aa8e21cc3f60e54dd9c5d1ec482ca440857568f0 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
* origin/5.11:
aa8e21c Add new Qt3D demo
ca03367 Exclude demos from colibri imx6ull
a5345fd qtwebbrowser: merge changes from qtwebbrowser git repo
d7e9731 do not enable highdpiscaling on emulator
f730907 Fix mediaplayer default video path
09aa32d Fix some major scaling & font issues on ebike-demo
Change-Id: I044c29ea2908a6254f32b0623037ea63f23d25cb
Diffstat (limited to 'basicsuite/ebike-ui/images')
-rw-r--r-- | basicsuite/ebike-ui/images/battery.png | bin | 292 -> 4103 bytes |
-rw-r--r-- | basicsuite/ebike-ui/images/curtain_shadow_handle.png | bin | 1787 -> 3766 bytes |
-rw-r--r-- | basicsuite/ebike-ui/images/small_speedometer_arrow.png | bin | 185 -> 1743 bytes |
-rw-r--r-- | basicsuite/ebike-ui/images/speed.png | bin | 400 -> 4432 bytes |
-rw-r--r-- | basicsuite/ebike-ui/images/top_curtain_drag.png | bin | 1200 -> 2623 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/basicsuite/ebike-ui/images/battery.png b/basicsuite/ebike-ui/images/battery.png Binary files differindex 170c48d..90280ca 100644 --- a/basicsuite/ebike-ui/images/battery.png +++ b/basicsuite/ebike-ui/images/battery.png diff --git a/basicsuite/ebike-ui/images/curtain_shadow_handle.png b/basicsuite/ebike-ui/images/curtain_shadow_handle.png Binary files differindex afaf3ec..6e57a56 100644 --- a/basicsuite/ebike-ui/images/curtain_shadow_handle.png +++ b/basicsuite/ebike-ui/images/curtain_shadow_handle.png diff --git a/basicsuite/ebike-ui/images/small_speedometer_arrow.png b/basicsuite/ebike-ui/images/small_speedometer_arrow.png Binary files differindex 4959e8d..728825d 100644 --- a/basicsuite/ebike-ui/images/small_speedometer_arrow.png +++ b/basicsuite/ebike-ui/images/small_speedometer_arrow.png diff --git a/basicsuite/ebike-ui/images/speed.png b/basicsuite/ebike-ui/images/speed.png Binary files differindex 17d2e6d..400ac9e 100644 --- a/basicsuite/ebike-ui/images/speed.png +++ b/basicsuite/ebike-ui/images/speed.png diff --git a/basicsuite/ebike-ui/images/top_curtain_drag.png b/basicsuite/ebike-ui/images/top_curtain_drag.png Binary files differindex 28388c6..46e9f90 100644 --- a/basicsuite/ebike-ui/images/top_curtain_drag.png +++ b/basicsuite/ebike-ui/images/top_curtain_drag.png |