diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:42:17 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:43:02 +0100 |
| commit | a78241bf0df8eef6dec1d935892697e01ae5e659 (patch) | |
| tree | 6e9f51fbc486fa197ecfdef65b4075ee0758c914 /src | |
| parent | 415d62017f5167a824838a7b681fc5bf76e6a5b9 (diff) | |
| parent | 49c5461af0888950b80eb9558647ccd764d55737 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: If0d163e84e99eb29b55a341df2dee59c46561adb
Diffstat (limited to 'src')
| -rw-r--r-- | src/purchasing/inapppurchase/mac/qmacinapppurchasetransaction.mm | 3 | ||||
| -rw-r--r-- | src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp | 6 |
2 files changed, 7 insertions, 2 deletions
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); |