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

Conflicts:
	src/quick/items/qquickitem.cpp
	src/quick/items/qquicktext.cpp
	tests/auto/quick/qquicklistview/tst_qquicklistview.cpp

Change-Id: I0bc5786098193c2c40b6fd8905de75d90f6ed0cf

1 files changed, 15 insertions, 0 deletions

diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h
index 5931d6c09e..ad026a3152 100644
--- a/src/quick/items/qquickitemview_p.h
+++ b/src/quick/items/qquickitemview_p.h
@@ -334,6 +334,21 @@ public:
         }
     }
 
+    void setSections(const QString &prev, const QString &sect, const QString &next) {
+        bool prevChanged = prev != m_prevSection;
+        bool sectChanged = sect != m_section;
+        bool nextChanged = next != m_nextSection;
+        m_prevSection = prev;
+        m_section = sect;
+        m_nextSection = next;
+        if (prevChanged)
+            Q_EMIT prevSectionChanged();
+        if (sectChanged)
+            Q_EMIT sectionChanged();
+        if (nextChanged)
+            Q_EMIT nextSectionChanged();
+    }
+
     void emitAdd() { Q_EMIT add(); }
     void emitRemove() { Q_EMIT remove(); }