diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-10-16 15:03:28 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-10-26 11:52:47 +0100 |
| commit | b0ce6db564d7e05131f00df83e654049bffbf04b (patch) | |
| tree | 03bdf86c143357fd786929a3d04e40bed88b0fe5 | |
| parent | d8bd1ef533eee1e94b3dddce1f9f8952abcf9023 (diff) | |
Remove usage of deprecated QStandardPaths::DataLocation
* Dependency update on qtbase, qtdeclarative and qtandroidextras
Task-number: QTBUG-87037
Change-Id: Ie19a660dc5613e470221cd50651fa7d7cd24b1c9
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
4 files changed, 7 insertions, 5 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 6231b56..ce164d8 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../qtandroidextras: - ref: 9af1f49884a523cedb5641081e07adef01259080 + ref: 1c906fab0d04341c8abed762c641231f44c6d8f3 required: false ../qtbase: - ref: c0538d5ff39b086d40fed943729b26aa3d17b602 + ref: f7f1a71ea41579c1ff86c08c16b82e4c84bc891f required: true ../qtdeclarative: - ref: 620d5d27721f3139537c7f49d1946b9721e25d14 + ref: d16e62d81587e98b054af4f66c02959c5bb89ff6 required: false diff --git a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp index 9445b57..b26baba 100644 --- a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp +++ b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp @@ -63,7 +63,7 @@ QAndroidInAppPurchaseBackend::QAndroidInAppPurchaseBackend(QObject *parent) QString QAndroidInAppPurchaseBackend::finalizedUnlockableFileName() const { - QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation); + QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); return path + QStringLiteral("/.qt-purchasing-data/iap_finalization.data"); } diff --git a/src/purchasing/inapppurchase/qinappstore_p.h b/src/purchasing/inapppurchase/qinappstore_p.h index 9c43cde..57f608d 100644 --- a/src/purchasing/inapppurchase/qinappstore_p.h +++ b/src/purchasing/inapppurchase/qinappstore_p.h @@ -42,6 +42,8 @@ #include "qinappproduct.h" #include "qinapppurchasebackend_p.h" + +#include <QtCore/qhash.h> #include <QtCore/qmutex.h> QT_BEGIN_NAMESPACE diff --git a/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp b/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp index ce3e320..751f025 100644 --- a/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp +++ b/src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp @@ -90,7 +90,7 @@ HRESULT QWinRTAppBridge::activate() { HRESULT hr; const QString storeFilename = QLatin1String("QtStoreSimulation.xml"); - const QString dataPath = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1Char('/'); + const QString dataPath = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QLatin1Char('/'); const QString storeSourceName = QLatin1String(":/") + storeFilename; const QString storeTargetName = dataPath + storeFilename; if (QFileInfo::exists(storeSourceName)) { |