diff options
author | Zeno Albisser <zeno.albisser@nokia.com> | 2010-08-20 06:40:41 -0400 |
---|---|---|
committer | Zeno Albisser <zeno.albisser@nokia.com> | 2010-08-20 06:40:41 -0400 |
commit | 2894c5017bd0d40428eecf3ef63185976e97d578 (patch) | |
tree | d7a4bd4b86c985aec4a68e01c4282fc0078a92cf | |
parent | 48ae7768726979d59274cf83bcdd45cf030d908c (diff) | |
parent | 364c509cf7949440bba354b80a558a7179481c40 (diff) |
Merge branch 'fancygraphics'
-rw-r--r-- | multilayer-dashboard/ColumnFour.qml | 12 | ||||
-rw-r--r-- | multilayer-dashboard/images/1.jpg | bin | 66904 -> 0 bytes | |||
-rw-r--r-- | multilayer-dashboard/images/1.png | bin | 0 -> 475381 bytes | |||
-rw-r--r-- | multilayer-dashboard/images/2.jpg | bin | 50734 -> 0 bytes | |||
-rw-r--r-- | multilayer-dashboard/images/2.png | bin | 0 -> 310017 bytes | |||
-rw-r--r-- | multilayer-dashboard/images/3.jpg | bin | 73570 -> 0 bytes | |||
-rw-r--r-- | multilayer-dashboard/images/3.png | bin | 0 -> 459841 bytes | |||
-rw-r--r-- | multilayer-dashboard/images/4.jpg | bin | 54669 -> 0 bytes | |||
-rw-r--r-- | multilayer-dashboard/images/4.png | bin | 0 -> 374758 bytes | |||
-rw-r--r-- | multilayer-dashboard/images/5.jpg | bin | 57354 -> 0 bytes | |||
-rw-r--r-- | multilayer-dashboard/images/5.png | bin | 0 -> 372444 bytes | |||
-rw-r--r-- | multilayer-dashboard/images/6.jpg | bin | 31973 -> 0 bytes | |||
-rw-r--r-- | multilayer-dashboard/images/6.png | bin | 0 -> 233423 bytes |
13 files changed, 6 insertions, 6 deletions
diff --git a/multilayer-dashboard/ColumnFour.qml b/multilayer-dashboard/ColumnFour.qml index 5de2fda..2bc5fab 100644 --- a/multilayer-dashboard/ColumnFour.qml +++ b/multilayer-dashboard/ColumnFour.qml @@ -58,12 +58,12 @@ Item { Repeater { model: [ - "images/1.jpg", - "images/2.jpg", - "images/3.jpg", - "images/4.jpg", - "images/5.jpg", - "images/6.jpg" + "images/1.png", + "images/2.png", + "images/3.png", + "images/4.png", + "images/5.png", + "images/6.png" ] ExpandableWidget { id: me diff --git a/multilayer-dashboard/images/1.jpg b/multilayer-dashboard/images/1.jpg Binary files differdeleted file mode 100644 index 4a799cc..0000000 --- a/multilayer-dashboard/images/1.jpg +++ /dev/null diff --git a/multilayer-dashboard/images/1.png b/multilayer-dashboard/images/1.png Binary files differnew file mode 100644 index 0000000..03a0a94 --- /dev/null +++ b/multilayer-dashboard/images/1.png diff --git a/multilayer-dashboard/images/2.jpg b/multilayer-dashboard/images/2.jpg Binary files differdeleted file mode 100644 index d2616aa..0000000 --- a/multilayer-dashboard/images/2.jpg +++ /dev/null diff --git a/multilayer-dashboard/images/2.png b/multilayer-dashboard/images/2.png Binary files differnew file mode 100644 index 0000000..c85b283 --- /dev/null +++ b/multilayer-dashboard/images/2.png diff --git a/multilayer-dashboard/images/3.jpg b/multilayer-dashboard/images/3.jpg Binary files differdeleted file mode 100644 index e470595..0000000 --- a/multilayer-dashboard/images/3.jpg +++ /dev/null diff --git a/multilayer-dashboard/images/3.png b/multilayer-dashboard/images/3.png Binary files differnew file mode 100644 index 0000000..17733ba --- /dev/null +++ b/multilayer-dashboard/images/3.png diff --git a/multilayer-dashboard/images/4.jpg b/multilayer-dashboard/images/4.jpg Binary files differdeleted file mode 100644 index fc6ed3b..0000000 --- a/multilayer-dashboard/images/4.jpg +++ /dev/null diff --git a/multilayer-dashboard/images/4.png b/multilayer-dashboard/images/4.png Binary files differnew file mode 100644 index 0000000..5631513 --- /dev/null +++ b/multilayer-dashboard/images/4.png diff --git a/multilayer-dashboard/images/5.jpg b/multilayer-dashboard/images/5.jpg Binary files differdeleted file mode 100644 index 25d7f56..0000000 --- a/multilayer-dashboard/images/5.jpg +++ /dev/null diff --git a/multilayer-dashboard/images/5.png b/multilayer-dashboard/images/5.png Binary files differnew file mode 100644 index 0000000..e181e49 --- /dev/null +++ b/multilayer-dashboard/images/5.png diff --git a/multilayer-dashboard/images/6.jpg b/multilayer-dashboard/images/6.jpg Binary files differdeleted file mode 100644 index 313749a..0000000 --- a/multilayer-dashboard/images/6.jpg +++ /dev/null diff --git a/multilayer-dashboard/images/6.png b/multilayer-dashboard/images/6.png Binary files differnew file mode 100644 index 0000000..d493886 --- /dev/null +++ b/multilayer-dashboard/images/6.png |