diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/declarative/contacts/dummydata/contactModel.qml | 2 | ||||
-rw-r--r-- | examples/declarative/easing/easing.qml | 2 | ||||
-rw-r--r-- | examples/declarative/listview/dummydata/MyPetsModel.qml | 2 | ||||
-rw-r--r-- | examples/declarative/listview/dummydata/Recipies.qml | 2 | ||||
-rw-r--r-- | examples/declarative/minehunt/minehunt.qml | 6 | ||||
-rw-r--r-- | examples/declarative/minehunt/pics/face-sad.png | bin | 0 -> 14844 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/pics/face-smile-big.png | bin | 0 -> 13810 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/pics/face-smile.png | bin | 0 -> 15408 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/pics/frown.png | bin | 1036 -> 0 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/pics/glee.png | bin | 1082 -> 0 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/pics/smile.png | bin | 1028 -> 0 bytes | |||
-rw-r--r-- | examples/declarative/velocity/velocity.qml | 2 |
12 files changed, 8 insertions, 8 deletions
diff --git a/examples/declarative/contacts/dummydata/contactModel.qml b/examples/declarative/contacts/dummydata/contactModel.qml index 48b2fd9..53f6b7b 100644 --- a/examples/declarative/contacts/dummydata/contactModel.qml +++ b/examples/declarative/contacts/dummydata/contactModel.qml @@ -1,4 +1,4 @@ -ListModel2 { +ListModel { ListElement { firstName: "Aaron" lastName: "Kennedy" diff --git a/examples/declarative/easing/easing.qml b/examples/declarative/easing/easing.qml index 32c1b9b..af675d1 100644 --- a/examples/declarative/easing/easing.qml +++ b/examples/declarative/easing/easing.qml @@ -4,7 +4,7 @@ Rect { height: Layout.height color: "white" - ListModel2 { + ListModel { id: EasingTypes ListElement { type: "easeLinear" } ListElement { type: "easeInQuad" } diff --git a/examples/declarative/listview/dummydata/MyPetsModel.qml b/examples/declarative/listview/dummydata/MyPetsModel.qml index 1c96b7f..4d76ff4 100644 --- a/examples/declarative/listview/dummydata/MyPetsModel.qml +++ b/examples/declarative/listview/dummydata/MyPetsModel.qml @@ -1,6 +1,6 @@ // ListModel allows free form list models to be defined and populated. // Be sure to name the file the same as the id. -ListModel2 { +ListModel { id: MyListElementsModel ListElement { name: "Polly" diff --git a/examples/declarative/listview/dummydata/Recipies.qml b/examples/declarative/listview/dummydata/Recipies.qml index 8f464da..3f2ab48 100644 --- a/examples/declarative/listview/dummydata/Recipies.qml +++ b/examples/declarative/listview/dummydata/Recipies.qml @@ -1,4 +1,4 @@ -ListModel2 { +ListModel { id: Recipies ListElement { title: "Pancakes" diff --git a/examples/declarative/minehunt/minehunt.qml b/examples/declarative/minehunt/minehunt.qml index 58397b0..bf31c3d 100644 --- a/examples/declarative/minehunt/minehunt.qml +++ b/examples/declarative/minehunt/minehunt.qml @@ -148,9 +148,9 @@ Item { text: numFlags } Image { - x: 240 - y: 0 - source: if(isPlaying==true){'pics/smile.png'}else{if(hasWon==true){'pics/glee.png'}else{'pics/frown.png'}} + x: 280 + y: 10 + source: if(isPlaying==true){'pics/face-smile.png'}else{if(hasWon==true){'pics/face-smile-big.png'}else{'pics/face-sad.png'}} MouseRegion { anchors.fill: parent onClicked: { reset() } diff --git a/examples/declarative/minehunt/pics/face-sad.png b/examples/declarative/minehunt/pics/face-sad.png Binary files differnew file mode 100644 index 0000000..cf00aaf --- /dev/null +++ b/examples/declarative/minehunt/pics/face-sad.png diff --git a/examples/declarative/minehunt/pics/face-smile-big.png b/examples/declarative/minehunt/pics/face-smile-big.png Binary files differnew file mode 100644 index 0000000..f9c2335 --- /dev/null +++ b/examples/declarative/minehunt/pics/face-smile-big.png diff --git a/examples/declarative/minehunt/pics/face-smile.png b/examples/declarative/minehunt/pics/face-smile.png Binary files differnew file mode 100644 index 0000000..3d66d72 --- /dev/null +++ b/examples/declarative/minehunt/pics/face-smile.png diff --git a/examples/declarative/minehunt/pics/frown.png b/examples/declarative/minehunt/pics/frown.png Binary files differdeleted file mode 100644 index 52684b3..0000000 --- a/examples/declarative/minehunt/pics/frown.png +++ /dev/null diff --git a/examples/declarative/minehunt/pics/glee.png b/examples/declarative/minehunt/pics/glee.png Binary files differdeleted file mode 100644 index 59ea583..0000000 --- a/examples/declarative/minehunt/pics/glee.png +++ /dev/null diff --git a/examples/declarative/minehunt/pics/smile.png b/examples/declarative/minehunt/pics/smile.png Binary files differdeleted file mode 100644 index ccd52cd..0000000 --- a/examples/declarative/minehunt/pics/smile.png +++ /dev/null diff --git a/examples/declarative/velocity/velocity.qml b/examples/declarative/velocity/velocity.qml index ff95527..786f364 100644 --- a/examples/declarative/velocity/velocity.qml +++ b/examples/declarative/velocity/velocity.qml @@ -2,7 +2,7 @@ Rect { color: "lightSteelBlue" width: 800 height: 600 - ListModel2 { + ListModel { id: List ListElement { name: "Sunday" |