From fe77b0e466cf1a19663285d240a634e674e022f1 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Mon, 31 May 2010 20:42:41 +0200
Subject: Fix some bugs in the QML Web Browser buttons

Now with fewer warnings! Also, the stop button works.
---
 demos/declarative/webbrowser/content/Button.qml           | 2 +-
 demos/declarative/webbrowser/content/FlickableWebView.qml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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
 
-- 
cgit v0.12