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

Conflicts:
	.qmake.conf
	src/quick/doc/src/qmltypereference.qdoc

Change-Id: Ia58f1c5a98309c32ef8d8e5c893faf261215f19f

1 files changed, 14 insertions, 0 deletions

diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index cbcf945a11..7c7bdbc137 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -171,6 +171,7 @@ available when you import \c QtQuick.
     \li \l real \c font.letterSpacing
     \li \l real \c font.wordSpacing
     \li \l bool \c font.kerning
+    \li \l enumeration \c font.hintingPreference
     \endlist
 
     Example:
@@ -237,6 +238,19 @@ available when you import \c QtQuick.
         \li Alters the text to be rendered with the first character of each word as an uppercase character.
     \endtable
 
+    Setting the hinting preference only has an effect when using the "NativeRendering" render type.
+    The property supports the following values:
+
+    \list
+    \value Font.PreferDefaultHinting - Use the default hinting level for the target platform.
+    \value Font.PreferNoHinting - If possible, render text without hinting the outlines
+           of the glyphs.
+    \value Font.PreferVerticalHinting - If possible, render text with no horizontal hinting,
+           but align glyphs to the pixel grid in the vertical direction.
+    \value Font.PreferFullHinting - If possible, render text with hinting in both horizontal and
+           vertical directions.
+    \endlist
+
     \sa {QML Basic Types}
 */