Merge pull request #14179 from lbilli/patch-1

On Linux use legacy 'data' directory only as a fallback
This commit is contained in:
Vladimir Golovnev 2021-01-08 22:15:34 +03:00 committed by GitHub
commit e3119b457c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -83,7 +83,7 @@ QString Private::DefaultProfile::dataLocation() const
const QString dataDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) const QString dataDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
+ QLatin1Char('/') + profileName() + QLatin1Char('/'); + QLatin1Char('/') + profileName() + QLatin1Char('/');
if (QDir(legacyDir).exists()) if (!QDir(dataDir).exists() && QDir(legacyDir).exists())
{ {
qWarning("The legacy data directory '%s' is used. It is recommended to move its content to '%s'", qWarning("The legacy data directory '%s' is used. It is recommended to move its content to '%s'",
qUtf8Printable(legacyDir), qUtf8Printable(dataDir)); qUtf8Printable(legacyDir), qUtf8Printable(dataDir));