diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-05-11 05:57:50 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-05-11 05:57:50 (GMT) |
| commit | b3526f5edf6425289ef2aa5c8adfc89892817ac0 (patch) | |
| tree | 6291a50711e80dbe7037f52d71f538b1a5410741 /demos | |
| parent | 7f22443b3cb6cd56a906dbb6edb0c2f7a1314887 (diff) | |
| parent | 692931ae2fec4fa8fc4ebcbcff20c952d6319536 (diff) | |
| download | Qt-b3526f5edf6425289ef2aa5c8adfc89892817ac0.zip Qt-b3526f5edf6425289ef2aa5c8adfc89892817ac0.tar.gz Qt-b3526f5edf6425289ef2aa5c8adfc89892817ac0.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/flickr/flickr.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/webbrowser/content/RectSoftShadow.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/webbrowser/content/pics/footer.sci | 6 | ||||
| -rw-r--r-- | demos/declarative/webbrowser/webbrowser.qml | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml index 092aef6..fa3bc35 100644 --- a/demos/declarative/flickr/flickr.qml +++ b/demos/declarative/flickr/flickr.qml @@ -153,7 +153,7 @@ Item { } PathAttribute { name: "scale"; value: 1 } - PathAttribute { name: "angle"; value: -45 } + PathAttribute { name: "angle"; value: 45 } } } diff --git a/demos/declarative/webbrowser/content/RectSoftShadow.qml b/demos/declarative/webbrowser/content/RectSoftShadow.qml index 5817f00..1734433 100644 --- a/demos/declarative/webbrowser/content/RectSoftShadow.qml +++ b/demos/declarative/webbrowser/content/RectSoftShadow.qml @@ -24,7 +24,7 @@ Item { source: "pics/softshadow-bottom.png" x: 0 y: parent.height - width: webview.width*webview.scale + width: WebView.width*WebView.scale height: 16 } } diff --git a/demos/declarative/webbrowser/content/pics/footer.sci b/demos/declarative/webbrowser/content/pics/footer.sci new file mode 100644 index 0000000..be1d086 --- /dev/null +++ b/demos/declarative/webbrowser/content/pics/footer.sci @@ -0,0 +1,6 @@ +gridLeft: 5 +gridTop: 0 +gridBottom: 0 +gridRight: 5 +imageFile: footer.png + diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index c754543..4b03b63 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -73,7 +73,7 @@ Item { color: "white" styleColor: "black" - style: Raised + style: "Raised" font.family: "Helvetica" font.size: 10 @@ -85,7 +85,7 @@ Item { anchors.rightMargin: 4 anchors.top: Header.top anchors.topMargin: 4 - hAlign: AlignHCenter + hAlign: "AlignHCenter" } Item { width: parent.width |