Merge remote-tracking branch 'origin/dev' into wip/cmake

Removed dependencies.yaml.

Change-Id: I82dc8977153cffc291c7588eaf15324eb027def0

5 files changed, 43 insertions, 2 deletions

diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5
new file mode 100644
index 0000000..e8be931
--- /dev/null
+++ b/dist/changes-5.12.5
@@ -0,0 +1,20 @@
+Qt 5.12.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.4.
+
+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.
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.13.1 b/dist/changes-5.13.1
new file mode 100644
index 0000000..57ebdbe
--- /dev/null
+++ b/dist/changes-5.13.1
@@ -0,0 +1,20 @@
+Qt 5.13.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.13.0.
+
+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.
+
+ - This release contains only minor code improvements.
diff --git a/src/gamepad/doc/qtgamepad.qdocconf b/src/gamepad/doc/qtgamepad.qdocconf
index 22fa763..db7f3b5 100644
--- a/src/gamepad/doc/qtgamepad.qdocconf
+++ b/src/gamepad/doc/qtgamepad.qdocconf
@@ -1,4 +1,5 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtgamepad.qdocconf)
 
 project                                         = QtGamepad
 description                                     = Qt Gamepad Reference Documentation
diff --git a/src/gamepad/doc/src/qtgamepad-index.qdoc b/src/gamepad/doc/src/qtgamepad-index.qdoc
index 3b4cd36..146cb49 100644
--- a/src/gamepad/doc/src/qtgamepad-index.qdoc
+++ b/src/gamepad/doc/src/qtgamepad-index.qdoc
@@ -59,7 +59,7 @@
   are not in scope for this module. A number of third-party gamepads may be
   supported as well, however, some of these may need custom configuration steps
   in order to map the button/trigger codes the device or driver in question
-  provides onto what QtGamepad expects. The can be done by the
+  provides onto what QtGamepad expects. This can be done by the
   \l{Qt Gamepad Configure Buttons Example}{configureButtons} example that can also
   save the generated layout persistently for use by other applications.
 
diff --git a/src/gamepad/gamepad.pro b/src/gamepad/gamepad.pro
index ceb45df..3615841 100644
--- a/src/gamepad/gamepad.pro
+++ b/src/gamepad/gamepad.pro
@@ -30,7 +30,7 @@ ANDROID_BUNDLED_JAR_DEPENDENCIES = \
     jar/QtAndroidGamepad.jar
 
 ANDROID_LIB_DEPENDENCIES = \
-    plugins/gamepads/libandroidgamepad.so
+    plugins/gamepads/libplugins_gamepads_androidgamepad.so
 
 ANDROID_FEATURES = \
     android.hardware.gamepad