Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/qml/compiler/qv4ssa.cpp
	src/qml/jsruntime/qv4arrayobject.cpp
	src/qml/jsruntime/qv4context.cpp

Change-Id: Ied5b23bec4dc14abe51127c507aed668f855c1e1

6 files changed, 12 insertions, 5 deletions

diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index ec199a5a9b..789d1952c0 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -665,7 +665,7 @@ is finished.
     \dots 8
     \snippet qml/flickableScrollbar.qml 1
 
-    \sa {declarative/ui-components/scrollbar}{scrollbar example}
+    \sa {declarative/customitems/scrollbar}{scrollbar example}
 */
 QQuickFlickable::QQuickFlickable(QQuickItem *parent)
   : QQuickItem(*(new QQuickFlickablePrivate), parent)
diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp
index 15ebf776aa..1ea5e57656 100644
--- a/src/quick/items/qquickflipable.cpp
+++ b/src/quick/items/qquickflipable.cpp
@@ -127,7 +127,7 @@ public:
     state, and \l {Animation and Transitions in Qt Quick} for more information on how
     animations work within transitions.
 
-    \sa {declarative/ui-components/flipable}{Flipable example}
+    \sa {declarative/customitems/flipable}{Flipable example}
 */
 QQuickFlipable::QQuickFlipable(QQuickItem *parent)
 : QQuickItem(*(new QQuickFlipablePrivate), parent)
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 2a507a27b1..3b63028a2e 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -1202,6 +1202,8 @@ QQuickKeysAttached::QQuickKeysAttached(QObject *parent)
     Q_D(QQuickKeysAttached);
     m_processPost = false;
     d->item = qmlobject_cast<QQuickItem*>(parent);
+    if (d->item != parent)
+        qWarning() << "Could not attach Keys property to: " << parent << " is not an Item";
 }
 
 QQuickKeysAttached::~QQuickKeysAttached()
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index f5c0e3b8d2..10f134f7ae 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -66,6 +66,7 @@ FxViewItem::~FxViewItem()
 {
     delete transitionableItem;
     if (ownItem && item) {
+        trackGeometry(false);
         item->setParentItem(0);
         item->deleteLater();
         item = 0;
@@ -1415,7 +1416,7 @@ qreal QQuickItemView::originX() const
     if (d->layoutOrientation() == Qt::Horizontal
             && effectiveLayoutDirection() == Qt::RightToLeft
             && contentWidth() < width()) {
-        return d->lastPosition() - d->footerSize();
+        return -d->lastPosition() - d->footerSize();
     }
     return QQuickFlickable::originX();
 }
@@ -1426,7 +1427,7 @@ qreal QQuickItemView::originY() const
     if (d->layoutOrientation() == Qt::Vertical
             && d->verticalLayoutDirection == QQuickItemView::BottomToTop
             && contentHeight() < height()) {
-        return d->lastPosition() - d->footerSize();
+        return -d->lastPosition() - d->footerSize();
     }
     return QQuickFlickable::originY();
 }
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index ae14a43de0..287173957f 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -2363,6 +2363,10 @@ void QQuickText::setLineHeightMode(LineHeightMode mode)
     minimumPointSize or minimumPixelSize property and maximum bound specified
     by either the \l font.pointSize or \l font.pixelSize properties.
 
+    \qml
+    Text { text: "Hello"; fontSizeMode: Text.Fit; minimumPixelSize: 10; font.pixelSize: 72 }
+    \endqml
+
     If the text does not fit within the item bounds with the minimum font size
     the text will be elided as per the \l elide property.
 */
diff --git a/src/quick/items/qquicktranslate.cpp b/src/quick/items/qquicktranslate.cpp
index 5c61fb33f8..14f8c204f3 100644
--- a/src/quick/items/qquicktranslate.cpp
+++ b/src/quick/items/qquicktranslate.cpp
@@ -336,7 +336,7 @@ public:
 
     \image axisrotation.png
 
-    \sa {declarative/ui-components/dialcontrol}{Dial Control example}, {Qt Quick Demo - Clocks}
+    \sa {declarative/customitems/dialcontrol}{Dial Control example}, {Qt Quick Demo - Clocks}
 */
 QQuickRotation::QQuickRotation(QObject *parent)
     : QQuickTransform(*new QQuickRotationPrivate, parent)