3 files changed, 12 insertions, 8 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 4b4efb6..d3bab7a 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -289,6 +289,12 @@ void QDeclarativeBorderImage::setSource(const QUrl &url)
         load();
 }
 
+void QDeclarativeBorderImage::setSourceSize(const QSize& size)
+{
+    Q_UNUSED(size);
+    qmlInfo(this) << "Setting sourceSize for borderImage not supported";
+}
+
 void QDeclarativeBorderImage::load()
 {
     Q_D(QDeclarativeBorderImage);
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
index 6a50c3c..6b05608 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
@@ -63,9 +63,6 @@ class Q_AUTOTEST_EXPORT QDeclarativeBorderImage : public QDeclarativeImageBase
     Q_PROPERTY(TileMode horizontalTileMode READ horizontalTileMode WRITE setHorizontalTileMode NOTIFY horizontalTileModeChanged)
     Q_PROPERTY(TileMode verticalTileMode READ verticalTileMode WRITE setVerticalTileMode NOTIFY verticalTileModeChanged)
 
-    // read-only for BorderImage
-    Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)
-
 public:
     QDeclarativeBorderImage(QDeclarativeItem *parent=0);
     ~QDeclarativeBorderImage();
@@ -83,10 +80,11 @@ public:
     void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
     void setSource(const QUrl &url);
 
+    void setSourceSize(const QSize&);
+
 Q_SIGNALS:
     void horizontalTileModeChanged();
     void verticalTileModeChanged();
-    void sourceSizeChanged();
 
 protected:
     virtual void load();
diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp
index 8c243ed..7a53224 100644
--- a/src/gui/util/qdesktopservices_s60.cpp
+++ b/src/gui/util/qdesktopservices_s60.cpp
@@ -313,12 +313,12 @@ static void handleUrlL(const TDesC& aUrl)
     CleanupStack::PopAndDestroy();
 }
 
-static bool handleUrl(const QUrl &url)
+static bool handleUrl(const QUrl &url, bool useEncodedUrl)
 {
     if (!url.isValid())
         return false;
 
-    QString urlString(url.toEncoded());
+    QString urlString(useEncodedUrl ? url.toEncoded() : url.toString());
     TPtrC urlPtr(qt_QString2TPtrC(urlString));
     TRAPD( err, handleUrlL(urlPtr));
     return err ? false : true;
@@ -326,12 +326,12 @@ static bool handleUrl(const QUrl &url)
 
 static bool launchWebBrowser(const QUrl &url)
 {
-    return handleUrl(url);
+    return handleUrl(url, true);
 }
 
 static bool openDocument(const QUrl &file)
 {
-    return handleUrl(file);
+    return handleUrl(file, false);
 }
 
 #endif //USE_SCHEMEHANDLER