diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 20:32:26 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 20:32:26 +0100 |
| commit | 501d45012f746d843e0144c78202297a577758bc (patch) | |
| tree | 5c2b125327d49e3495b5f47995d93fb4215acbb4 /examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background@2x.9.png | |
| parent | 9e1b044afa994cdd77fd256cea78cd144e804d76 (diff) | |
| parent | 442843db6f5dce6b594448d43b380c9b884a7c91 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/quickcontrols2/qquickchecklabel.cpp
src/quickcontrols2/qquickchecklabel_p.h
src/quickcontrols2/qquickmnemoniclabel_p.h
src/quicktemplates2/qquickbuttongroup_p.h
src/quicktemplates2/qquickspinbox.cpp
src/quicktemplates2/qquickswipedelegate.cpp
Change-Id: I1278b78dcaf25be5698f34751193b83dc951eb3c
Diffstat (limited to 'examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background@2x.9.png')
| -rw-r--r-- | examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background@2x.9.png | bin | 0 -> 3314 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background@2x.9.png Binary files differnew file mode 100644 index 00000000..7c97b8d1 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background@2x.9.png |