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

Change-Id: I614ee6943ab5cff62cefb2de884af8cb02fe7f55

2 files changed, 26 insertions, 1 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 55e31e9b..a5831035 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -4,4 +4,4 @@ DEFINES += QT_NO_FOREACH
 
 QQC2_SOURCE_TREE = $$PWD
 
-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 00000000..af5214cd
--- /dev/null
+++ b/dist/changes-5.13.2
@@ -0,0 +1,25 @@
+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.
+
+****************************************************************************
+*                                 Controls                                 *
+****************************************************************************
+
+ - QQuickTextArea:
+   * Fixed rendering issue when using TextArea in a ScrollView.