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

View File

@@ -83,7 +83,7 @@ QString Private::DefaultProfile::dataLocation() const
const QString dataDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
+ 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'",
qUtf8Printable(legacyDir), qUtf8Printable(dataDir));