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

Change-Id: Ib7962e4b610df0423d5ca2d8c302f350d4b7ffdd

2 files changed, 29 insertions, 2 deletions

diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0
new file mode 100644
index 00000000..ebf37a73
--- /dev/null
+++ b/dist/changes-5.12.0
@@ -0,0 +1,27 @@
+Qt 5.12 introduces many new features and improvements as well as bugfixes
+over the 5.11.x series. 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.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+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.
+
+****************************************************************************
+*                                 Android                                  *
+****************************************************************************
+
+ - Examples:
+   * [QTBUG-70159] Updated AndroidManifest.xml in accelbubble example to be
+     compatible with Qt again.
+
+- Documentation:
+   * [QTBUG-70625] remove iOS from compatmap for AmbientLight sensor
diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes
index 24e38ac5..fc97257d 100644
--- a/src/imports/sensors/plugins.qmltypes
+++ b/src/imports/sensors/plugins.qmltypes
@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtSensors 5.11'
+// 'qmlplugindump -nonrelocatable QtSensors 5.12'
 
 Module {
-    dependencies: ["QtQuick 2.8"]
+    dependencies: ["QtQuick 2.12"]
     Component {
         name: "QmlAccelerometer"
         prototype: "QmlSensor"