Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/corelib/global/qlogging.cpp

Change-Id: I9cc8f25ad897efab6a42cb5c5161b1c9402952f0

3 files changed, 21 insertions, 4 deletions

diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 18e8bcf99c..a20f4329b1 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -2392,7 +2392,7 @@ void QWindowPrivate::maybeQuitOnLastWindowClosed()
     bool lastWindowClosed = true;
     for (int i = 0; i < list.size(); ++i) {
         QWindow *w = list.at(i);
-        if (!w->isVisible() || w->transientParent())
+        if (!w->isVisible() || w->transientParent() || w->type() == Qt::ToolTip)
             continue;
         lastWindowClosed = false;
         break;
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 867eb76200..1c772ef232 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -5637,15 +5637,16 @@ static void qt_gradient_quint16(int count, const QSpan *spans, void *userData)
         int yinc = int((linear.dy * data->m22 * gss) * FIXPT_SIZE);
         int off = int((((linear.dy * (data->m22 * qreal(0.5) + data->dy) + linear.off) * gss) * FIXPT_SIZE));
 
-        QRgba64 oldColor = data->solid.color;
+        // Save the fillData since we overwrite it when setting solid.color.
+        QGradientData gradient = data->gradient;
         while (count--) {
             int y = spans->y;
 
-            data->solid.color = QRgba64::fromArgb32(qt_gradient_pixel_fixed(&data->gradient, yinc * y + off));
+            data->solid.color = QRgba64::fromArgb32(qt_gradient_pixel_fixed(&gradient, yinc * y + off));
             blend_color_rgb16(1, spans, userData);
             ++spans;
         }
-        data->solid.color = oldColor;
+        data->gradient = gradient;
 
     } else {
         blend_src_generic(count, spans, userData);
diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp
index eadb65959a..88b9e218fb 100644
--- a/src/gui/text/qrawfont.cpp
+++ b/src/gui/text/qrawfont.cpp
@@ -317,6 +317,13 @@ bool QRawFont::operator==(const QRawFont &other) const
 /*!
    Returns the ascent of this QRawFont in pixel units.
 
+   The ascent of a font is the distance from the baseline to the
+   highest position characters extend to. In practice, some font
+   designers break this rule, e.g. when they put more than one accent
+   on top of a character, or to accommodate an unusual character in
+   an exotic language, so it is possible (though rare) that this
+   value will be too small.
+
    \sa QFontMetricsF::ascent()
 */
 qreal QRawFont::ascent() const
@@ -327,6 +334,11 @@ qreal QRawFont::ascent() const
 /*!
    Returns the descent of this QRawFont in pixel units.
 
+   The descent is the distance from the base line to the lowest point
+   characters extend to. In practice, some font designers break this rule,
+   e.g. to accommodate an unusual character in an exotic language, so
+   it is possible (though rare) that this value will be too small.
+
    \sa QFontMetricsF::descent()
 */
 qreal QRawFont::descent() const
@@ -337,6 +349,8 @@ qreal QRawFont::descent() const
 /*!
    Returns the xHeight of this QRawFont in pixel units.
 
+   This is often but not always the same as the height of the character 'x'.
+
    \sa QFontMetricsF::xHeight()
 */
 qreal QRawFont::xHeight() const
@@ -347,6 +361,8 @@ qreal QRawFont::xHeight() const
 /*!
    Returns the leading of this QRawFont in pixel units.
 
+   This is the natural inter-line spacing.
+
    \sa QFontMetricsF::leading()
 */
 qreal QRawFont::leading() const