diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-08-24 11:10:54 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-08-24 11:11:38 +0300 |
| commit | 75addc77b361384b018ec28bde26e5880887c80f (patch) | |
| tree | 38d58d5737dda597a6a69f2c931672575e5ed217 /basicsuite/qtquickcontrols2/images/arrows@4x.png | |
| parent | 22cdfdd27aaa885ac5b7b450c8fb82b87853250d (diff) | |
| parent | 1ff81b46a37550bb4430cc032b6d5504525af53f (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
* origin/5.11:
1ff81b4 Merge remote-tracking branch 'origin/5.9' into 5.11
3594ea2 Fix scaling, video path & focusing issues on mediaplayer demo
e81384c Remove confusing highlighting on media player file browser
4aa85d7 Use QSettings for color definitions
a60eb67 Disable graphical effect from imx7 boards
83bffe9 Move color definitions to QSettings
57bc95f Fix qtquickcontrols2 demo image paths & controls theme
a5ba671 Doc: Bump version to 5.11.2
1510d96 Doc: bump version to 5.9.7
cc9de37 Fix mediaplayer slider color definitions
c20966f Move info button to mediaplayer-demo footer
0b0d77e Fix mediaplayer color definitions
a607978 Update Boot2Qt Launcher demo icons & doc images
773a661 Disable webbrowser demo from all imx7 boards
9f18bb7 Doc: Bump version to 5.11.1
4fa8854 Doc: remove outdate doc folder under qtquickcontrols2 example
054a2ea doc: add missing doc images for e-bike & quickcontrols2 demo
173d934 Update Boot2Qt demos appearing in QtCreator
a70868f Enable ebike demo
6ed3d30 Temporarily disable e-bike from the basicsuite demo set
28e9fdf Fix Media Player demo color definitions
6b5a6d0 Fix paths for demos.xml
783ca94 Doc: bump version to 5.9.6
d083365 Add new Ebike demo to basicsuite
da60352 Move common definitions to shared settings
e513aed Update QtWebBrowser demo to new UI theme
f5c4c3a Remove qtwebbrowser submodule
3fa5796 Replace existing controls demos with controls 2 gallery example
04e4798 Update Mediaplayer demo to new UI theme
2e8942f Update GraphicalEffects demo to new UI theme
e365074 Add new fonts
7c41444 Update Charts demo to new UI theme
2a50d49 Comment out 7 demos from demos.xml file
9e941af Doc: Bump version to 5.9.5
0909f9b Doc: Bump version to 5.11.0
55fee3b Doc: Bump version to 5.9.4
89033ce Doc: Bump version to 5.9.3
Change-Id: I17ac5f2e2ef94535458b07cf8db38688e25ca21c
Diffstat (limited to 'basicsuite/qtquickcontrols2/images/arrows@4x.png')
| -rw-r--r-- | basicsuite/qtquickcontrols2/images/arrows@4x.png | bin | 0 -> 2765 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/basicsuite/qtquickcontrols2/images/arrows@4x.png b/basicsuite/qtquickcontrols2/images/arrows@4x.png Binary files differnew file mode 100644 index 0000000..66c1fac --- /dev/null +++ b/basicsuite/qtquickcontrols2/images/arrows@4x.png |