Merge remote-tracking branch 'origin/5.14' into 5.15

 Conflicts:
	src/gui/image/qpnghandler.cpp

Change-Id: I8630f363457bb613d8fb88470a71d95d97cdb301

3 files changed, 54 insertions, 2 deletions

diff --git a/src/gui/doc/src/richtext.qdoc b/src/gui/doc/src/richtext.qdoc
index 24fd4240b3..31a2ebf05b 100644
--- a/src/gui/doc/src/richtext.qdoc
+++ b/src/gui/doc/src/richtext.qdoc
@@ -1269,6 +1269,55 @@
     \row    \li \c word-spacing
             \li <width>px
             \li Specifies an alternate spacing between each word.
+    \row    \li \c line-height
+            \li <number>[% | px | pt | cm]
+            \li Specifies the height of a line. It can be one of the
+                following:
+                \list
+                 \li fixed line height in pixels, points, or centimeters.
+                 \li a percentage of the current font size.
+                \endlist
+    \endtable
+
+    \section1 Qt-specific CSS properties
+
+    Besides the standard CSS properties listed earlier, the following
+    Qt-specific properties can also be used to style a text block:
+
+    \table
+    \header \li Property
+            \li Values
+            \li Description
+    \row
+            \li \c -qt-block-indent
+            \li \c <number>
+            \li Indents the text block by the specified no. spaces.
+    \row
+            \li \c -qt-list-indent
+            \li \c <number>
+            \li Indents the list items by the specified no. of spaces.
+    \row
+            \li \c -qt-list-number-prefix
+            \li \c <string>
+            \li Prefixes the given string to list number in an HTML ordered list.
+    \row
+            \li \c -qt-list-number-suffix
+            \li <string>
+            \li Suffixes the given string to list number in an HTML ordered list.
+    \row
+            \li \c -qt-paragraph-type
+            \li \c empty
+            \li Hides the text block.
+    \row
+            \li \c -qt-table-type
+            \li \c{root | frame}
+            \li \c root renders the text blocks inline without borders and
+                indentation, whereas \c frame renders them on a new line
+                with a frame around.
+    \row
+            \li \c -qt-user-state
+            \li \c <number>
+            \li Adds it as user data for the text block.
     \endtable
 
     \section1 Supported CSS Selectors
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index 251f09fe52..49f9550519 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -916,6 +916,9 @@ bool QPNGImageWriter::writeImage(const QImage& image, int compression_in, const
     }
 
     png_set_error_fn(png_ptr, nullptr, nullptr, qt_png_warning);
+#ifdef PNG_BENIGN_ERRORS_SUPPORTED
+    png_set_benign_errors(png_ptr, 1);
+#endif
 
     info_ptr = png_create_info_struct(png_ptr);
     if (!info_ptr) {
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 04970a942b..3c6f35bb6d 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -1150,8 +1150,8 @@ QKeyEvent::~QKeyEvent()
   Note: The native scan code may be 0, even if the key event contains
   extended information.
 
-  Note: On Mac OS/X, this function is not useful, because there is no
-  way to get the scan code from Carbon or Cocoa. The function always
+  Note: On \macos, this function is not useful, because there is no
+  way to get the scan code from the system APIs. The function always
   returns 1 (or 0 in the case explained above).
 */