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

Change-Id: I4af0bf8ec1569097d97f8ce0bb8bf1a0e4a989ec

7 files changed, 18 insertions, 6 deletions

diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index fcb6c2da8f..68f465cc5a 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -228,6 +228,9 @@ QQuickCanvasItemPrivate::~QQuickCanvasItemPrivate()
     operations. The Canvas output may be saved as an image file or serialized
     to a URL.
 
+    Rendering to the Canvas is done using a Context2D object, usually as a
+    result of the \l paint signal.
+
     To define a drawing area in the Canvas item set the \c width and \c height
     properties.  For example, the following code creates a Canvas item which
     has a drawing area with a height of 100 pixels and width of 200 pixels:
@@ -237,6 +240,11 @@ QQuickCanvasItemPrivate::~QQuickCanvasItemPrivate()
         id: mycanvas
         width: 100
         height: 200
+        onPaint: {
+            var ctx = getContext("2d");
+            ctx.fillStyle = Qt.rgba(1, 0, 0, 1);
+            ctx.fillRect(0, 0, width, height);
+        }
     }
     \endqml
 
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 2bfb16a0f4..dec2351de8 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -2514,6 +2514,8 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo
                 lastChild = prevTabChildItem(current, -1);
         }
         bool isTabFence = current->d_func()->isTabFence;
+        if (isTabFence && !hasChildren)
+            return current;
 
         // coming from parent: check children
         if (hasChildren && from == current->parentItem()) {
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index 1d581d769f..7009a8e328 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -957,7 +957,7 @@ void QQuickItemViewPrivate::positionViewAtIndex(int index, int mode)
         switch (mode) {
         case QQuickItemView::Beginning:
             pos = itemPos;
-            if (index < 0 && header)
+            if (header && (index < 0 || hasStickyHeader()))
                 pos -= headerSize();
             break;
         case QQuickItemView::Center:
@@ -965,7 +965,7 @@ void QQuickItemViewPrivate::positionViewAtIndex(int index, int mode)
             break;
         case QQuickItemView::End:
             pos = itemPos - size() + item->size();
-            if (index >= model->count() && footer)
+            if (footer && (index >= model->count() || hasStickyFooter()))
                 pos += footerSize();
             break;
         case QQuickItemView::Visible:
diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h
index 220df577c3..5e104cf208 100644
--- a/src/quick/items/qquickitemview_p_p.h
+++ b/src/quick/items/qquickitemview_p_p.h
@@ -344,6 +344,8 @@ protected:
     virtual bool showFooterForIndex(int index) const = 0;
     virtual void updateHeader() = 0;
     virtual void updateFooter() = 0;
+    virtual bool hasStickyHeader() const { return false; };
+    virtual bool hasStickyFooter() const { return false; };
 
     virtual void createHighlight() = 0;
     virtual void updateHighlight() = 0;
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 0aee8f2067..e42873f459 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -123,8 +123,8 @@ public:
     bool showFooterForIndex(int index) const Q_DECL_OVERRIDE;
     void updateHeader() Q_DECL_OVERRIDE;
     void updateFooter() Q_DECL_OVERRIDE;
-    bool hasStickyHeader() const;
-    bool hasStickyFooter() const;
+    bool hasStickyHeader() const Q_DECL_OVERRIDE;
+    bool hasStickyFooter() const Q_DECL_OVERRIDE;
 
     void changedVisibleIndex(int newIndex) Q_DECL_OVERRIDE;
     void initializeCurrentItem() Q_DECL_OVERRIDE;
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index dc41a4739b..42de98eff7 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -124,7 +124,7 @@ bool QQuickMouseAreaPrivate::isWheelConnected()
 void QQuickMouseAreaPrivate::propagate(QQuickMouseEvent* event, PropagateType t)
 {
     Q_Q(QQuickMouseArea);
-    if (!propagateComposedEvents)
+    if (!window || !propagateComposedEvents)
         return;
     QPointF scenePos = q->mapToScene(QPointF(event->x(), event->y()));
     propagateHelper(event, window->contentItem(), scenePos, t);
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index aa9c8d21eb..97e00362be 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -471,7 +471,7 @@ void QQuickTextPrivate::updateSize()
 }
 
 QQuickTextLine::QQuickTextLine()
-    : QObject(), m_line(0), m_height(0)
+    : QObject(), m_line(0), m_height(0), m_lineOffset(0)
 {
 }