summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2023-03-23 16:00:19 +0200
committerTarja Sundqvist <tarja.sundqvist@qt.io>2023-03-23 16:00:19 +0200
commit5737c10128c6eeb28c10df569c8492bb2e8f4230 (patch)
treeb3825f3d5cb4bf173001b1a9ac3e38be1db67ebc
parent9dfea35b04dcb52d02d7a2883df88d89ba9999ef (diff)
parenta7b612787e91bd3010795b5836c36d371bd7007f (diff)
Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl
-rw-r--r--.qmake.conf2
-rw-r--r--src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 3215b0d..fac175f 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,6 +2,6 @@ load(qt_build_config)
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.15.8
+MODULE_VERSION = 5.15.9
CMAKE_MODULE_TESTS=-
diff --git a/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java b/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java
index e751935..7554473 100644
--- a/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java
+++ b/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java
@@ -108,7 +108,7 @@ public class QtInAppPurchase implements PurchasesUpdatedListener
@Override
public void onBillingSetupFinished(BillingResult billingResult) {
if (billingResult.getResponseCode() == RESULT_OK) {
- purchasedProductsQueried(m_nativePointer);
+ queryPurchasedProducts();
}
}
@@ -218,6 +218,7 @@ public class QtInAppPurchase implements PurchasesUpdatedListener
purchase.getOrderId(),
purchase.getPurchaseTime());
}
+ purchasedProductsQueried(m_nativePointer);
}
});
}