Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta1

Conflicts:
	.qmake.conf

Change-Id: I59c9a70eba366693053bb684b374cff02650ace0

3 files changed, 11 insertions, 7 deletions

diff --git a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp
index 0a0a5d1..e6a42cb 100644
--- a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp
+++ b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp
@@ -103,9 +103,9 @@ bool QAndroidInAppPurchaseBackend::isReady() const
 
 void QAndroidInAppPurchaseBackend::restorePurchases()
 {
-    QSet<QString> previouslyFinalizedUnlockables = m_finalizedUnlockableProducts;
+    const QSet<QString> previouslyFinalizedUnlockables = std::move(m_finalizedUnlockableProducts);
     m_finalizedUnlockableProducts.clear();
-    foreach (QString previouslyFinalizedUnlockable, previouslyFinalizedUnlockables) {
+    for (const QString &previouslyFinalizedUnlockable : previouslyFinalizedUnlockables) {
         QInAppProduct *product = store()->registeredProduct(previouslyFinalizedUnlockable);
         Q_ASSERT(product != 0);
 
@@ -214,7 +214,7 @@ void QAndroidInAppPurchaseBackend::registerFinalizedUnlockable(const QString &id
     }
 
     QDataStream stream(&file);
-    foreach (QString finalizedUnlockableProduct, m_finalizedUnlockableProducts)
+    for (const QString &finalizedUnlockableProduct : qAsConst(m_finalizedUnlockableProducts))
         stream << finalizedUnlockableProduct;
 }
 
diff --git a/src/purchasing/inapppurchase/qinapppurchasebackend.cpp b/src/purchasing/inapppurchase/qinapppurchasebackend.cpp
index 69e8bd5..6621255 100644
--- a/src/purchasing/inapppurchase/qinapppurchasebackend.cpp
+++ b/src/purchasing/inapppurchase/qinapppurchasebackend.cpp
@@ -48,7 +48,7 @@ bool QInAppPurchaseBackend::isReady() const
 
 void QInAppPurchaseBackend::queryProducts(const QList<Product> &products)
 {
-    foreach (const Product &product, products)
+    for (const Product &product : products)
         queryProduct(product.productType, product.identifier);
 }
 
diff --git a/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp b/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp
index 438a9ee..213aece 100644
--- a/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp
+++ b/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp
@@ -739,9 +739,13 @@ HRESULT QWinRTInAppPurchaseBackendPrivate::onListingInformation(IAsyncOperation<
 
         ComPtr<IProductListingWithConsumables> converted;
         hr = value.As(&converted);
-        Q_ASSERT_SUCCEEDED(hr);
-        hr = converted->get_ProductType(&nativeInfo->type);
-        Q_ASSERT_SUCCEEDED(hr);
+        if (SUCCEEDED(hr)) {
+            hr = converted->get_ProductType(&nativeInfo->type);
+            Q_ASSERT_SUCCEEDED(hr);
+        } else {
+            qWarning("Could not acquire product type. Assuming Unlockable");
+            nativeInfo->type = ProductType_Durable;
+        }
 
         qCDebug(lcPurchasingBackend) << "Detailed info:"
                                  << " ID:" << QString::fromWCharArray(nativeInfo->productID.GetRawBuffer(nullptr))