Merge remote-tracking branch 'origin/5.8' into 5.9

Change-Id: Iaa273e655c5997337b1fd00733e513a3f5747693

3 files changed, 4 insertions, 4 deletions

diff --git a/doc/src/qmlapp/usecases/layouts.qdoc b/doc/src/qmlapp/usecases/layouts.qdoc
index 297600e9..fe2098e5 100644
--- a/doc/src/qmlapp/usecases/layouts.qdoc
+++ b/doc/src/qmlapp/usecases/layouts.qdoc
@@ -39,7 +39,7 @@ Items can be placed at specific x,y coordinates on the screen by setting their x
 setup their position relative to the top left corner of their parent, according to the
 \l {Concepts - Visual Coordinates in Qt Quick}{visual coordinate system} rules.
 
-Combined with using \l{Property Binding}{bindings} instead of constant valudes for these properties, relative positioning is also easily
+Combined with using \l{Property Binding}{bindings} instead of constant values for these properties, relative positioning is also easily
 accomplished by setting the x and y coordinates to the appropriate bindings.
 
 \snippet qmlapp/usecases/layouts.qml import
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 9e285895..63922518 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -223,9 +223,9 @@
         \li Classes to make printing easier and more portable.
     \row
         \li \l{Qt Purchasing}
+        \li All
         \li \l{Qt for Android}{Android}, \l{Qt for iOS}{iOS}, and
-            \l{Qt for OS X}{OS X}.
-        \li
+            \l{Qt for macOS}{\macos}.
         \li Enables in-app purchase of products in Qt applications.
     \row \li \l{Qt Quick Controls 2}
          \li All
diff --git a/doc/src/whatsnew/whatsnew50.qdoc b/doc/src/whatsnew/whatsnew50.qdoc
index deabd11b..70a4edce 100644
--- a/doc/src/whatsnew/whatsnew50.qdoc
+++ b/doc/src/whatsnew/whatsnew50.qdoc
@@ -174,7 +174,7 @@
     following:
     \list
      \li QQuickView
-     \li QQuickCanvas
+     \li QQuickWindow
      \li QQuickItem
      \li QQuickPaintedItem
     \endlist