Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits)
  Image bounding rect should always include the area being painted
  Fix minehunt.pro (minehunt is no longer a plugin)
  Don't allow flagging of flipped tiles in Minehunt
  Remove Snake demo from QtDemo
  Fix samegame text input focus
  Whitespace fixes
  Update visual tests for Mac.
  Run all QML visual tests now.
  Make qmlvisual tests more stable
  Add documentation about script evaluation context and allowed types
  Maintain passing visualtests on X11
  Fix errors in example code. Also reverts the example code to the old
  Largely rewrite the Using QML in C++ Applications documentation. It
  Document list type operations
  Fix regression in 648eb76c and update visual tests.
  Don't emit xChanged()/yChanged() twice.
  Add testcase for QTBUG-13719.
  Doc fix
  highlightranges.qml example and visual test contained binding loop.
  Combining ListView.StrictlyEnforceRange and resizing currentItem stalls.
  ...

1 files changed, 33 insertions, 10 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index 08d237f..3b08a9b 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -259,8 +259,10 @@ void QDeclarativeImage::setFillMode(FillMode mode)
     \qmlproperty real Image::paintedHeight
 
     These properties hold the size of the image that is actually painted.
-    In most cases it is the same as \c width and \c height, but when using a \c fillMode like
-    \c PreserveAspectFit \c paintedWidth or \c paintedHeight can be smaller than \c width and \c height.
+    In most cases it is the same as \c width and \c height, but when using a 
+    \c fillMode \c PreserveAspectFit or \c fillMode \c PreserveAspectCrop 
+    \c paintedWidth or \c paintedHeight can be smaller or larger than 
+    \c width and \c height of the Image element.
 */
 qreal QDeclarativeImage::paintedWidth() const
 {
@@ -288,23 +290,25 @@ qreal QDeclarativeImage::paintedHeight() const
     Use this status to provide an update or respond to the status change in some way.
     For example, you could:
 
-    \e {Trigger a state change:}
-    \qml 
-        State { name: 'loaded'; when: image.status = Image.Ready }
+    \list
+    \o Trigger a state change:
+    \qml
+        State { name: 'loaded'; when: image.status == Image.Ready }
     \endqml
 
-    \e {Implement an \c onStatusChanged signal handler:}
-    \qml 
+    \o Implement an \c onStatusChanged signal handler:
+    \qml
         Image {
             id: image
             onStatusChanged: if (image.status == Image.Ready) console.log('Loaded')
         }
     \endqml
 
-    \e {Bind to the status value:}
+    \o Bind to the status value:
     \qml
-        Text { text: image.status != Image.Ready ? 'Not Loaded' : 'Loaded' }
+        Text { text: image.status == Image.Ready ? 'Loaded' : 'Not loaded' }
     \endqml
+    \endlist
 
     \sa progress
 */
@@ -397,6 +401,19 @@ void QDeclarativeImage::updatePaintedGeometry()
         if (heightValid() && !widthValid()) {
             setImplicitWidth(d->paintedWidth);
         }
+    } else if (d->fillMode == PreserveAspectCrop) {
+        if (!d->pix.width() || !d->pix.height())
+            return;
+        qreal widthScale = width() / qreal(d->pix.width());
+        qreal heightScale = height() / qreal(d->pix.height());
+        if (widthScale < heightScale) {
+            widthScale = heightScale;
+        } else if(heightScale < widthScale) {
+            heightScale = widthScale;
+        }
+
+        d->paintedHeight = heightScale * qreal(d->pix.height());
+        d->paintedWidth = widthScale * qreal(d->pix.width());
     } else {
         d->paintedWidth = width();
         d->paintedHeight = height();
@@ -410,6 +427,12 @@ void QDeclarativeImage::geometryChanged(const QRectF &newGeometry, const QRectF
     updatePaintedGeometry();
 }
 
+QRectF QDeclarativeImage::boundingRect() const
+{
+    Q_D(const QDeclarativeImage);
+    return QRectF(0, 0, qMax(d->mWidth, d->paintedWidth), qMax(d->mHeight, d->paintedHeight));
+}
+
 /*!
     \qmlproperty url Image::source
 
@@ -494,7 +517,7 @@ void QDeclarativeImage::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWi
             }
             if (clip()) {
                 p->save();
-                p->setClipRect(boundingRect(), Qt::IntersectClip);
+                p->setClipRect(QRectF(0, 0, d->mWidth, d->mHeight), Qt::IntersectClip);
             }
             scale.scale(widthScale, heightScale);
             QTransform old = p->transform();