diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-05-31 18:42:41 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-05-31 18:42:41 (GMT) |
| commit | fe77b0e466cf1a19663285d240a634e674e022f1 (patch) | |
| tree | ba5fdc3999d4124471f8e121589fc46486397ca7 /demos/declarative/webbrowser/content | |
| parent | 6bd67cf30b1574a114d9852820fe0fb8d3d10c50 (diff) | |
| download | Qt-fe77b0e466cf1a19663285d240a634e674e022f1.zip Qt-fe77b0e466cf1a19663285d240a634e674e022f1.tar.gz Qt-fe77b0e466cf1a19663285d240a634e674e022f1.tar.bz2 | |
Fix some bugs in the QML Web Browser buttons
Now with fewer warnings! Also, the stop button works.
Diffstat (limited to 'demos/declarative/webbrowser/content')
| -rw-r--r-- | demos/declarative/webbrowser/content/Button.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/webbrowser/content/FlickableWebView.qml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/demos/declarative/webbrowser/content/Button.qml b/demos/declarative/webbrowser/content/Button.qml index 976502c..4642cc7 100644 --- a/demos/declarative/webbrowser/content/Button.qml +++ b/demos/declarative/webbrowser/content/Button.qml @@ -49,7 +49,7 @@ Item { Image { id: icon; anchors.centerIn: parent - opacity: action.enabled ? 1.0 : 0.4 + opacity: if(action != undefined) {action.enabled ? 1.0 : 0.4} else 0 } MouseArea { diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml index 3a1b515..62da2ea 100644 --- a/demos/declarative/webbrowser/content/FlickableWebView.qml +++ b/demos/declarative/webbrowser/content/FlickableWebView.qml @@ -48,6 +48,7 @@ Flickable { property alias progress: webView.progress property alias url: webView.url property alias back: webView.back + property alias stop: webView.stop property alias reload: webView.reload property alias forward: webView.forward |