diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2010-05-14 06:05:56 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2010-05-14 06:05:56 (GMT) |
| commit | b7f4b58a94f3be8f8c2fa2f2e4acc3a05e621e92 (patch) | |
| tree | 0cd414958d7f12a427db74838139a244bd10adce /examples | |
| parent | 3f775da6fec8b5cfb5e538100b7889401d14c410 (diff) | |
| parent | b915d0aa46599f707df4db6eb33965602a2d7422 (diff) | |
| download | Qt-b7f4b58a94f3be8f8c2fa2f2e4acc3a05e621e92.zip Qt-b7f4b58a94f3be8f8c2fa2f2e4acc3a05e621e92.tar.gz Qt-b7f4b58a94f3be8f8c2fa2f2e4acc3a05e621e92.tar.bz2 | |
Merge branch '4.7' of scm.dev-nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/listview/dynamic.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/scrollbar/display.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/xmldata/daringfireball.qml | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/examples/declarative/listview/dynamic.qml b/examples/declarative/listview/dynamic.qml index 9b05ad5..64f324e 100644 --- a/examples/declarative/listview/dynamic.qml +++ b/examples/declarative/listview/dynamic.qml @@ -151,7 +151,7 @@ Rectangle { // Only show the scrollbar when the view is moving. states: State { - name: "ShowBars"; when: view.moving + name: "ShowBars"; when: view.movingVertically PropertyChanges { target: verticalScrollBar; opacity: 1 } } transitions: Transition { diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml index b8a5e36..6b12d85 100644 --- a/examples/declarative/scrollbar/display.qml +++ b/examples/declarative/scrollbar/display.qml @@ -20,7 +20,7 @@ Rectangle { // Only show the scrollbars when the view is moving. states: State { name: "ShowBars" - when: view.moving + when: view.movingVertically || view.movingHorizontally PropertyChanges { target: verticalScrollBar; opacity: 1 } PropertyChanges { target: horizontalScrollBar; opacity: 1 } } diff --git a/examples/declarative/xmldata/daringfireball.qml b/examples/declarative/xmldata/daringfireball.qml index a1df809..480b13c 100644 --- a/examples/declarative/xmldata/daringfireball.qml +++ b/examples/declarative/xmldata/daringfireball.qml @@ -1,7 +1,6 @@ import Qt 4.7 Rectangle { - color: "white" width: 600; height: 600 XmlListModel { |