From e6fb3c7a87fb69bf6b568325cea1fa7ad74b7305 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 31 Oct 2020 14:29:35 +0100 Subject: [PATCH] Port from QStandardPaths::DataLocation to QStandardPaths::AppDataLocation They are the same on Linux (but DataLocation is deprecated). On Windows this enables the use of the roaming path. NO_CHANGELOG --- src/plasma/private/dataenginemanager.cpp | 2 +- src/plasma/private/storagethread.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plasma/private/dataenginemanager.cpp b/src/plasma/private/dataenginemanager.cpp index 6b35de159..f99d1bc07 100644 --- a/src/plasma/private/dataenginemanager.cpp +++ b/src/plasma/private/dataenginemanager.cpp @@ -145,7 +145,7 @@ void DataEngineManager::unloadEngine(const QString &name) void DataEngineManager::timerEvent(QTimerEvent *) { #ifndef NDEBUG - QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QStringLiteral("/plasma_dataenginemanager_log"); + QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QStringLiteral("/plasma_dataenginemanager_log"); QFile f(path); if (!f.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) { // qCDebug(LOG_PLASMA) << "failed to open" << path; diff --git a/src/plasma/private/storagethread.cpp b/src/plasma/private/storagethread.cpp index 2cac3e581..c621b182d 100644 --- a/src/plasma/private/storagethread.cpp +++ b/src/plasma/private/storagethread.cpp @@ -66,7 +66,7 @@ void StorageThread::initializeDb(StorageJob *caller) { if (!m_db.open()) { m_db = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"), QStringLiteral("plasma-storage-%1").arg((quintptr)this)); - const QString storageDir = QStandardPaths::writableLocation(QStandardPaths::DataLocation); + const QString storageDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); QDir().mkpath(storageDir); m_db.setDatabaseName(storageDir + QLatin1Char('/') + QStringLiteral("plasma-storage2.db")); }