Merge remote branch 'origin/4.8' into doc-staging-master

Conflicts:
	dist/changes-4.8.0

1 files changed, 8 insertions, 2 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 9c274e9..d3bab7a 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -215,7 +215,7 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage()
 
 /*!
     \qmlproperty bool BorderImage::cache
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Specifies whether the image should be cached. The default value is
     true. Setting \a cache to false is useful when dealing with large images,
@@ -224,7 +224,7 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage()
 
 /*!
     \qmlproperty bool BorderImage::mirror
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     This property holds whether the image should be horizontally inverted
     (effectively displaying a mirrored image).
@@ -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);