diff options
author | Martin Jones <martin.jones@nokia.com> | 2011-09-01 23:04:37 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2011-09-01 23:13:02 (GMT) |
commit | 941f886eab8714a02003816f347103697437e7db (patch) | |
tree | 267e163d9db2ee3a2a57560f2a91ea8ceb4eb167 | |
parent | 340c22999d9f9678c9035c1dc372423e970b8ca7 (diff) | |
download | Qt-941f886eab8714a02003816f347103697437e7db.zip Qt-941f886eab8714a02003816f347103697437e7db.tar.gz Qt-941f886eab8714a02003816f347103697437e7db.tar.bz2 |
Revert readonly BorderImage::sourceSize change
Revert a32728ce8cf4fa1d1dc1001b1fadc66e9c86e025
Writing to BorderImage sourceSize has never been allowed and issued
a warning, however this should not have been enforced in a patch
release.
Change-Id: I8f8d10e6ccd4e771fd38a27ce9d68f921b761d96
Task-number: QTTH-1501
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeborderimage.cpp | 6 | ||||
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeborderimage_p.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp index 836ad49..25b70c7 100644 --- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp @@ -291,6 +291,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(); |