Merge remote-tracking branch 'origin/5.13.2' into 5.13

Change-Id: I2b55bea338aa854d940a6da9b6703866209e6ba6

5 files changed, 79 insertions, 2 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 16ea641bd2..451a93ee59 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,4 +1,4 @@
 load(qt_build_config)
 CONFIG += warning_clean
 
-MODULE_VERSION = 5.13.1
+MODULE_VERSION = 5.13.2
diff --git a/dist/changes-5.13.2 b/dist/changes-5.13.2
new file mode 100644
index 0000000000..6936f38721
--- /dev/null
+++ b/dist/changes-5.13.2
@@ -0,0 +1,63 @@
+Qt 5.13.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.13.0 through 5.13.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                                  QtQml                                   *
+****************************************************************************
+
+ - [QTBUG-77761] EcmaScript modules are loaded correctly now when using the
+   Qt Quick Compiler.
+ - [QTBUG-74087] Various JavaScript list-like constructs are parsed
+   iteratively rather than recursively now, avoiding stack overflows.
+ - [QTBUG-78554] Exceptions thrown from a promise's resolve or reject
+   handler are forwarded correctly now.
+ - [QTBUG-78996] MakeDay() and getDay() now behave more correctly.
+
+****************************************************************************
+*                                 QtQuick                                  *
+****************************************************************************
+
+ - [QTBUG-79084] The QQuickWindow::afterAnimating signal is now emitted
+   properly when using QQuickRenderControl.
+ - [QTBUG-79011] Fix an odd 1px offset when rendering an Image with
+   fillMode: PreserveAspectFit.
+ - [QTBUG-78468] Fixed the hanging native pictures dialog on iOS.
+
+ - Item Views:
+
+   * [QTBUG-77074] Fixed a bug when TableView columnWidthProvider calculates
+     the widths of columns after a previously-hidden row is shown again.
+   * [QTBUG-77173] If you click or tap a PathView while it's moving,
+     it will come to rest with the nearest delegate aligned properly.
+   * [QTBUG-77418] ListView highlightRangeMode works correctly after
+     currentIndex is changed.
+
+ - Text:
+
+   * If the alpha of a text background is 0, the background rectangle node
+     is now omitted from the scene graph.
+   * [QTBUG-77389] Fixed TextEdit paragraph-selection triple click feature.
+
+ - OpenVG rendering:
+
+   * [QTBUG-77019] Fixed sprites leaking textures.
+   * [QTBUG-76526] Fixed per-frame delivery of touch events.
+   * [QTBUG-76806] The sceneGraphInitialized and sceneGraphInvalidated
+     signals are now emitted properly.
+   * [QTBUG-76589] Fixed rendering of non-affine transformed rectangles.
diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp
index 513f7f2997..4aed0f2fee 100644
--- a/src/qml/types/qqmlbind.cpp
+++ b/src/qml/types/qqmlbind.cpp
@@ -174,6 +174,10 @@ QQmlBind::~QQmlBind()
 
     When the binding becomes inactive again, any direct bindings that were previously
     set on the property will be restored.
+
+    \note A previously set literal value is not restored when the Binding becomes inactive. Rather,
+    the last value set by the now inactive Binding is retained. This behavior will change in future
+    versions of Qt.
 */
 bool QQmlBind::when() const
 {
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index 8303c3fed1..7d128b4a16 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -1937,6 +1937,10 @@ Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const QQuickPointerEvent *e
 {
     QDebugStateSaver saver(dbg);
     dbg.nospace();
+    if (!event) {
+        dbg << "QQuickPointerEvent(0)";
+        return dbg;
+    }
     dbg << "QQuickPointerEvent(";
     dbg << event->timestamp();
     dbg << " dev:";
@@ -1957,6 +1961,10 @@ Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const QQuickEventPoint *eve
 {
     QDebugStateSaver saver(dbg);
     dbg.nospace();
+    if (!event) {
+        dbg << "QQuickEventPoint(0)";
+        return dbg;
+    }
     dbg << "QQuickEventPoint(accepted:" << event->isAccepted()
         << " state:";
     QtDebugUtils::formatQEnum(dbg, event->state());
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
index b63f7de9f1..55c095af8e 100644
--- a/src/quickwidgets/qquickwidget.cpp
+++ b/src/quickwidgets/qquickwidget.cpp
@@ -878,7 +878,9 @@ void QQuickWidgetPrivate::createContext()
 
         context = new QOpenGLContext;
         context->setFormat(offscreenWindow->requestedFormat());
-
+        const QWindow *win = q->window()->windowHandle();
+        if (win && win->screen())
+            context->setScreen(win->screen());
         QOpenGLContext *shareContext = qt_gl_global_share_context();
         if (!shareContext)
             shareContext = QWidgetPrivate::get(q->window())->shareContext();