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

 Conflicts:
	.qmake.conf

Change-Id: I70910b0106c2c8b09469d03f0c823b23c0d1ac81

doc/src/highdpi.qdoc

@@ -99,7 +99,7 @@
         <key>NSHighResolutionCapable</key>
         <string>True</string>
     \endcode
-    Never versions of qmake will generate Info.plist's with the NSPrincipalClass key,
+    Newer versions of qmake will generate Info.plist's with the NSPrincipalClass key,
     which is sufficient since NSHighResolutionCapable is true by default.
 
     \note \macos and iOS may apply further virtualization such that device pixels do not

doc/src/qmlapp/usecases/layouts.qdoc

@@ -68,7 +68,7 @@ For full details, see \l {Positioning with Anchors} and the documentation of the
 \section1 Positioners
 
 For the common case of wanting to \e position a set of types in a regular pattern, Qt Quick provides some positioner
-types. Items placed in a positioner are automatically positioned in some way; for example, a \l Row positions items to be
+types. Items placed in a positioner are automatically positioned in some way; for example, a \l [QML] Row positions items to be
 horizontally adjacent (forming a row).
 
 For full details see \l {Item Positioners} and the documentation for \l{Qt Positioning QML Types}{the positioner types}.