Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: I47e795bc7e6a05d66f56ba1129ae6ac738288f6f

3 files changed, 26 insertions, 2 deletions

diff --git a/dist/changes-5.7.1 b/dist/changes-5.7.1
new file mode 100644
index 0000000..adfb816
--- /dev/null
+++ b/dist/changes-5.7.1
@@ -0,0 +1,24 @@
+Qt 5.7.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.7.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.7 series is binary compatible with the 5.6.x series.
+Applications compiled for 5.6 will continue to run with 5.7.
+
+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
+-------
+
+ - [QTBUG-54518] Fixed test purchases after changes in Google Play that
+   removed the order ID for such transactions.
diff --git a/src/purchasing/doc/src/googleplay.qdoc b/src/purchasing/doc/src/googleplay.qdoc
index abc1576..d69b5cb 100644
--- a/src/purchasing/doc/src/googleplay.qdoc
+++ b/src/purchasing/doc/src/googleplay.qdoc
@@ -140,7 +140,7 @@
   Fill out the following information about your product:
   \list
    \li \uicontrol{Product ID} - an identifier that is used to access the
-   product from your code. It's also
+   product from your code.
    \li \uicontrol{Product Type} - Choose \uicontrol{Managed product} as this is
    the only type supported by the Qt Purchasing API.
    \li Price for the product in all the different geographical areas where it is
diff --git a/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp b/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp
index 37ed8a9..438a9ee 100644
--- a/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp
+++ b/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp
@@ -311,7 +311,7 @@ QWinRTInAppPurchaseBackend::QWinRTInAppPurchaseBackend(QObject *parent)
 {
     d_ptr.reset(new QWinRTInAppPurchaseBackendPrivate(this));
 
-    qRegisterMetaType<qt_WinRTTransactionData>("TransactionData");
+    qRegisterMetaType<qt_WinRTTransactionData>("qt_WinRTTransactionData");
 
     qCDebug(lcPurchasingBackend) << __FUNCTION__;
 }