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

Change-Id: Ibb584a2d7975996cd26514b82d1da2d447fcbebf

diff --cc src/qml/qml/qqmlcomponent.cpp
index 850ee53,c7b2f14..8f12335
--- 1/src/qml/qml/qqmlcomponent.cpp
--- 2/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@@ -231,12 -214,11 +231,12 @@@ static inline QString buildTypeNameForD
      because it is defined inside a \c Component. The component encapsulates the
      QML types within, as if they were defined in a separate QML
      file, and is not loaded until requested (in this case, by the
 -    two \l Loader objects).
 +    two \l Loader objects). Because Component is not derived from Item, you cannot
 +    anchor anything to it.
  
      Defining a \c Component is similar to defining a \l {QML Document}{QML document}.
-     A QML document has a single top-level item that defines the behaviors and
-     properties of that component, and cannot define properties or behaviors outside
+     A QML document has a single top-level item that defines the behavior and
+     properties of that component, and cannot define properties or behavior outside
      of that top-level item. In the same way, a \c Component definition contains a single
      top level item (which in the above example is a \l Rectangle) and cannot define any
      data outside of this item, with the exception of an \e id (which in the above example

diff --cc src/quick/scenegraph/qsgthreadedrenderloop.cpp
Simple merge