diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-02 06:05:00 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-02 06:05:00 (GMT) |
| commit | 34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd (patch) | |
| tree | a7e0c9a55afb413443c55733622e813e17eaea95 /demos | |
| parent | 685c0b930a1d1ecfdcc78aa688a333564cc9ca5b (diff) | |
| parent | fd7d730d04862095898773a781bb9a254d0aeb00 (diff) | |
| download | Qt-34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd.zip Qt-34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd.tar.gz Qt-34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd.tar.bz2 | |
Merge branch 'master' into 4.7
Conflicts:
tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
Diffstat (limited to 'demos')
4 files changed, 4 insertions, 1 deletions
diff --git a/demos/declarative/flickr/common/ImageDetails.qml b/demos/declarative/flickr/common/ImageDetails.qml index 9604f10..862eeb1 100644 --- a/demos/declarative/flickr/common/ImageDetails.qml +++ b/demos/declarative/flickr/common/ImageDetails.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import org.webkit 1.0 Flipable { id: container diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml index 76a5813..cf4c825 100644 --- a/demos/declarative/webbrowser/content/FlickableWebView.qml +++ b/demos/declarative/webbrowser/content/FlickableWebView.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import org.webkit 1.0 Flickable { property alias title: webView.title diff --git a/demos/declarative/webbrowser/content/fieldtext/FieldText.qml b/demos/declarative/webbrowser/content/fieldtext/FieldText.qml index 19b6acc..d282209 100644 --- a/demos/declarative/webbrowser/content/fieldtext/FieldText.qml +++ b/demos/declarative/webbrowser/content/fieldtext/FieldText.qml @@ -85,7 +85,7 @@ Item { font.bold: true text: label opacity: textEdit.text == '' ? 1 : 0 - opacity: Behavior { + Behavior on opacity { NumberAnimation { property: "opacity" duration: 250 diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index 6a427f4..b6cccb0 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import org.webkit 1.0 import "content" |