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/automotive/icons/automotive/44x44@2 | |
| 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/automotive/icons/automotive/44x44@2')
| -rw-r--r-- | examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/air-con.png | bin | 0 -> 2337 bytes |
| -rw-r--r-- | examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/command.png | bin | 0 -> 2461 bytes |
| -rw-r--r-- | examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/message.png | bin | 0 -> 639 bytes |
| -rw-r--r-- | examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/music.png | bin | 0 -> 1106 bytes |
| -rw-r--r-- | examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/navigation.png | bin | 0 -> 1604 bytes |
| -rw-r--r-- | examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/seats.png | bin | 0 -> 1793 bytes |
| -rw-r--r-- | examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/settings.png | bin | 0 -> 2413 bytes |
| -rw-r--r-- | examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/statistics.png | bin | 0 -> 394 bytes |
| -rw-r--r-- | examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/windows.png | bin | 0 -> 999 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/air-con.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/air-con.png Binary files differnew file mode 100644 index 00000000..8822979e --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/air-con.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/command.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/command.png Binary files differnew file mode 100644 index 00000000..918e2b69 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/command.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/message.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/message.png Binary files differnew file mode 100644 index 00000000..1debfdfb --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/message.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/music.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/music.png Binary files differnew file mode 100644 index 00000000..01a3ece4 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/music.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/navigation.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/navigation.png Binary files differnew file mode 100644 index 00000000..3a18fb5f --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/navigation.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/seats.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/seats.png Binary files differnew file mode 100644 index 00000000..7d67f1be --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/seats.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/settings.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/settings.png Binary files differnew file mode 100644 index 00000000..3ce2a1f1 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/settings.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/statistics.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/statistics.png Binary files differnew file mode 100644 index 00000000..afc2cc09 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/statistics.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/windows.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/windows.png Binary files differnew file mode 100644 index 00000000..59bac584 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/windows.png |
