Merge remote-tracking branch 'origin/5.9' into 5.105.10

 Conflicts:
	.qmake.conf

Change-Id: If135b3be3bfe1d9c44c44dad9f006161a6c7dc19

3 files changed, 32 insertions, 2 deletions

diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4
new file mode 100644
index 0000000..06bd87a
--- /dev/null
+++ b/dist/changes-5.9.4
@@ -0,0 +1,25 @@
+Qt 5.9.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.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.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+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.
+
+****************************************************************************
+*                               Qt 5.9.4 Changes                           *
+****************************************************************************
+
+ - [QTBUG-64549] winrt: React on failure in LoadListingInformationAsync
+ - [QTBUG-64531] Fix the build on tvOS
diff --git a/src/purchasing/inapppurchase/mac/qmacinapppurchasetransaction.mm b/src/purchasing/inapppurchase/mac/qmacinapppurchasetransaction.mm
index a085dcd..9f28c87 100644
--- a/src/purchasing/inapppurchase/mac/qmacinapppurchasetransaction.mm
+++ b/src/purchasing/inapppurchase/mac/qmacinapppurchasetransaction.mm
@@ -69,7 +69,8 @@ QMacInAppPurchaseTransaction::QMacInAppPurchaseTransaction(SKPaymentTransaction
             m_errorString = QStringLiteral("Cloud Service Network Connection Failed");
             break;
 #endif
-#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(100300) || QT_TVOS_PLATFORM_SDK_EQUAL_OR_ABOVE(100200)
+                                               // rdar://35589806
+#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(100300) // || QT_TVOS_PLATFORM_SDK_EQUAL_OR_ABOVE(100200)
         case SKErrorCloudServiceRevoked:
             m_errorString = QStringLiteral("Cloud Service Revoked");
             break;
diff --git a/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp b/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp
index 2735d57..ce3e320 100644
--- a/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp
+++ b/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp
@@ -699,11 +699,15 @@ void QWinRTInAppPurchaseBackend::fulfillConsumable(QWinRTInAppTransaction *trans
 HRESULT QWinRTInAppPurchaseBackendPrivate::onListingInformation(IAsyncOperation<ListingInformation *> *args,
                                                          AsyncStatus status)
 {
-    Q_UNUSED(status);
     Q_Q(QWinRTInAppPurchaseBackend);
 
     qCDebug(lcPurchasingBackend) << __FUNCTION__;
 
+    if (status != AsyncStatus::Completed) {
+        qCDebug(lcPurchasingBackend) << "Loading of listing information failed.";
+        return S_OK;
+    }
+
     ComPtr<IListingInformation> info;
     HRESULT hr = args->GetResults(&info);
     Q_ASSERT_SUCCEEDED(hr);