Merge remote-tracking branch 'origin/5.3.2' into 5.3

Change-Id: I730f27f7a56cc285803c5cc88fdd1022d1cc93e2

2 files changed, 37 insertions, 0 deletions

diff --git a/dist/changes-5.3.2 b/dist/changes-5.3.2
new file mode 100644
index 00000000..3b735acb
--- /dev/null
+++ b/dist/changes-5.3.2
@@ -0,0 +1,25 @@
+Qt 5.3.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.3.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5
+
+The Qt version 5.3 series is binary compatible with the 5.2.x series.
+Applications compiled for 5.2 will continue to run with 5.3.
+
+Some of the changes listed in this file may include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+ - Documentation: Fixed several instances of missing or incorrect information.
diff --git a/doc/src/platforms/platform-notes-android.qdoc b/doc/src/platforms/platform-notes-android.qdoc
index c7d56794..b168fa46 100644
--- a/doc/src/platforms/platform-notes-android.qdoc
+++ b/doc/src/platforms/platform-notes-android.qdoc
@@ -115,6 +115,18 @@
     \gui Run settings of your project, expanding \gui{Package configurations} and selecting the
     \gui Libraries tab. Manually check the libraries that are dependencies of your project.
 
+    \section1 Text Special Considerations
+
+    Because of a bug in some OpenGL drivers, the mechanism used by Qt to cache text glyphs does
+    not work as expected on all Android devices, causing text to appear scrambled. To remedy this,
+    a workaround is in place, which increases memory consumption and can also affect text rendering
+    performance. Before Qt 5.3.2, the workaround was enabled only for a particular set of devices.
+    It is now used by default on all devices.
+
+    You can disable the workaround by setting the \c QT_ANDROID_DISABLE_GLYPH_CACHE_WORKAROUND
+    environment variable to \c 1. You should do so only after verifying that text appears correctly
+    on all targeted devices.
+
     \section1 OpenGL Special Considerations
 
     Qt for Android provides two separate platform plugins: One which is suited for traditional