Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	tests/auto/quick/qquickgridview/qquickgridview.pro
	tests/auto/quick/qquickitem/qquickitem.pro

Change-Id: Ic54cafbdda1ac22757d2ee65dcc63a1b167c7556

2 files changed, 69 insertions, 0 deletions

diff --git a/dist/changes-5.1.1 b/dist/changes-5.1.1
new file mode 100644
index 0000000000..be59ba9e79
--- /dev/null
+++ b/dist/changes-5.1.1
@@ -0,0 +1,44 @@
+Qt 5.1.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.1.0.
+
+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.1/
+
+Some of the changes listed in this file 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                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+ - [QTBUG-32621][QTBUG-32572][QTBUG-32545] Multiple fixes for the new
+    QtQuick.Dialogs ColorDialog.
+ - [QTBUG-30908] XmlHttpRequest: Requests which receive a redirect now use
+    GET as per spec.
+ - [QTBUG-32332] QtQuick.ListView: Snap immediately once snapMode changes.
+ - [QTBUG-31647] QtQuick.Text: Maintain vertical position when height
+    changes.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Qt for Embedded
+--------------
+
+ - [QTBUG-30908] Fix SceneGraph text rendering on certain OpenGL ES drivers
diff --git a/dist/changes-5.1.2 b/dist/changes-5.1.2
new file mode 100644
index 0000000000..2ea62a4f6b
--- /dev/null
+++ b/dist/changes-5.1.2
@@ -0,0 +1,25 @@
+Qt 5.1.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.1.0 and 5.1.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.1/
+
+Some of the changes listed in this file 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.
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+
+ - QTBUG-32838: Setting the model property of ListView, GridView or PathView to
+   an empty model will now correctly reset currentIndex to -1. In prior versions
+   currentIndex was set to 0 regardless of the actual number of rows in the model
+   when the model property was changed after the view's initialization.
+