diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-02 10:23:36 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-02 10:23:36 +0100 |
commit | 715023b490f4cbae7d6b11356f7247979b01ad00 (patch) | |
tree | f7851e0c366d0b1a43710be13ad2e8d5a4eb2525 /src/imports/controls/material/images | |
parent | 5be4488fb15b544926af203feeffa5ced8184f1f (diff) | |
parent | 00a7dfd16d4484064bd0e5601720993d0525995a (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/imports/platform/qquickplatformmenuitem.cpp
Change-Id: I4d399aa81a31112edf6030b52ba5d68828f9729d
Diffstat (limited to 'src/imports/controls/material/images')
-rw-r--r-- | src/imports/controls/material/images/check@2x.png | bin | 1526 -> 1347 bytes |
-rw-r--r-- | src/imports/controls/material/images/check@3x.png | bin | 2341 -> 1982 bytes |
-rw-r--r-- | src/imports/controls/material/images/check@4x.png | bin | 3058 -> 2580 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/src/imports/controls/material/images/check@2x.png b/src/imports/controls/material/images/check@2x.png Binary files differindex 744f80b5..deb0c7e9 100644 --- a/src/imports/controls/material/images/check@2x.png +++ b/src/imports/controls/material/images/check@2x.png diff --git a/src/imports/controls/material/images/check@3x.png b/src/imports/controls/material/images/check@3x.png Binary files differindex dbf12b6d..72ffd4e6 100644 --- a/src/imports/controls/material/images/check@3x.png +++ b/src/imports/controls/material/images/check@3x.png diff --git a/src/imports/controls/material/images/check@4x.png b/src/imports/controls/material/images/check@4x.png Binary files differindex 764dd7ee..9dc1ab2c 100644 --- a/src/imports/controls/material/images/check@4x.png +++ b/src/imports/controls/material/images/check@4x.png |