diff options
author | Christopher Ham <christopher.ham@nokia.com> | 2010-12-03 06:20:58 (GMT) |
---|---|---|
committer | Christopher Ham <christopher.ham@nokia.com> | 2010-12-03 06:34:25 (GMT) |
commit | b02cf26c0c236679439826cb8093f6dd6d3b2fec (patch) | |
tree | be166040a0ba410a25b41da6586a98cd35b0890d /src/declarative/graphicsitems/qdeclarativeborderimage.cpp | |
parent | a305814f8f59f634943d8d5f8d87d2fd49891cb3 (diff) | |
download | Qt-b02cf26c0c236679439826cb8093f6dd6d3b2fec.zip Qt-b02cf26c0c236679439826cb8093f6dd6d3b2fec.tar.gz Qt-b02cf26c0c236679439826cb8093f6dd6d3b2fec.tar.bz2 |
borderImage should not support setting sourceSize
SIGNAL sourceSizeChanged is properly called. Setting the sourceSize for
borderImage in QML returns a warning. Auto tests were added to check
that sourceSize remains consistent.
Reviewed-by: Joona Petrell
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeborderimage.cpp')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeborderimage.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp index c770a85..0bf09ad 100644 --- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp @@ -246,6 +246,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); @@ -315,6 +321,7 @@ void QDeclarativeBorderImage::load() d->progress = 1.0; emit statusChanged(d->status); emit progressChanged(d->progress); + requestFinished(); update(); } } @@ -475,6 +482,9 @@ void QDeclarativeBorderImage::requestFinished() setImplicitWidth(impsize.width()); setImplicitHeight(impsize.height()); + if (d->sourcesize.width() != d->pix.width() || d->sourcesize.height() != d->pix.height()) + emit sourceSizeChanged(); + d->progress = 1.0; emit statusChanged(d->status); emit progressChanged(1.0); |