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

Conflicts:
	src/quick/items/qquickrectangle.cpp

Change-Id: Ia40bc0f2f08b5be68e32eb1e1f118445d20e44fc

diff --cc src/quick/items/qquickitem.cpp
Simple merge

diff --cc src/quick/items/qquickitemview.cpp
Simple merge

diff --cc src/quick/items/qquickitemview_p_p.h
Simple merge

diff --cc src/quick/items/qquicklistview.cpp
index 6324d79,77cdbce..9422269
--- 1/src/quick/items/qquicklistview.cpp
--- 2/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@@ -2138,35 -2145,11 +2145,36 @@@ void QQuickListView::setOrientation(QQu
      of additional memory usage.  It is not a substitute for creating efficient
      delegates; the fewer objects and bindings in a delegate, the faster a view can be
      scrolled.
 +
 +    The cacheBuffer operates outside of any display margins specified by
 +    displayMarginBeginning or displayMarginEnd.
  */
  
 +/*!
 +    \qmlproperty int QtQuick::ListView::displayMarginBeginning
 +    \qmlproperty int QtQuick::ListView::displayMarginEnd
 +    \since QtQuick 2.3
 +
 +    This property allows delegates to be displayed outside of the view geometry.
 +
 +    If this value is non-zero, the view will create extra delegates before the
 +    start of the view, or after the end. The view will create as many delegates
 +    as it can fit into the pixel size specified.
 +
 +    For example, if in a vertical view the delegate is 20 pixels high and
 +    \c displayMarginBeginning and \c displayMarginEnd are both set to 40,
 +    then 2 delegates above and 2 delegates below will be created and shown.
 +
 +    The default value is 0.
 +
 +    This property is meant for allowing certain UI configurations,
 +    and not as a performance optimization. If you wish to create delegates
 +    outside of the view geometry for performance reasons, you probably
 +    want to use the cacheBuffer property instead.
 +*/
  
  /*!
+     \qmlpropertygroup QtQuick::ListView::section
      \qmlproperty string QtQuick::ListView::section.property
      \qmlproperty enumeration QtQuick::ListView::section.criteria
      \qmlproperty Component QtQuick::ListView::section.delegate

diff --cc src/quick/items/qquickmousearea.cpp
Simple merge

diff --cc src/quick/items/qquickrectangle.cpp
index d632302,48f79a2..ee1b66f
--- 1/src/quick/items/qquickrectangle.cpp
--- 2/src/quick/items/qquickrectangle.cpp
+++ b/src/quick/items/qquickrectangle.cpp
@@@ -321,16 -321,7 +321,17 @@@ void QQuickRectangle::doUpdate(
  }
  
  /*!
 +    \qmlproperty bool QtQuick::Rectangle::antialiasing
 +
 +    Used to decide if the Rectangle should use antialiasing or not.
 +    \l {Antialiasing} provides information on the performance implications
 +    of this property.
 +
 +    The default is true for Rectangles with a radius, and false otherwise.
 +*/
 +
 +/*!
+     \qmlpropertygroup QtQuick::Rectangle::border
      \qmlproperty int QtQuick::Rectangle::border.width
      \qmlproperty color QtQuick::Rectangle::border.color
  

diff --cc tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
Simple merge