GODT-2138: fix UserDataDir for Windows and mac.
This commit is contained in:
committed by
Romain Le Jeune
parent
c473e987f4
commit
1395f1c990
@ -137,10 +137,10 @@ QString userCacheDir()
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
QString userDataDir()
|
QString userDataDir()
|
||||||
{
|
{
|
||||||
QString dir;
|
QString folder;
|
||||||
|
|
||||||
#ifdef Q_OS_LINUX
|
#ifdef Q_OS_LINUX
|
||||||
dir = qgetenv ("XDG_DATA_HOME");
|
QString dir = qgetenv ("XDG_DATA_HOME");
|
||||||
if (dir.isEmpty())
|
if (dir.isEmpty())
|
||||||
{
|
{
|
||||||
dir = qgetenv ("HOME");
|
dir = qgetenv ("HOME");
|
||||||
@ -148,12 +148,11 @@ QString userDataDir()
|
|||||||
throw Exception("neither $XDG_DATA_HOME nor $HOME are defined");
|
throw Exception("neither $XDG_DATA_HOME nor $HOME are defined");
|
||||||
dir += "/.local/share";
|
dir += "/.local/share";
|
||||||
}
|
}
|
||||||
#else
|
folder = QDir(dir).absoluteFilePath(configFolder);
|
||||||
dir = userCacheDir();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
QString const folder = QDir(dir).absoluteFilePath(configFolder);
|
|
||||||
QDir().mkpath(folder);
|
QDir().mkpath(folder);
|
||||||
|
#else
|
||||||
|
folder = userCacheDir();
|
||||||
|
#endif
|
||||||
|
|
||||||
return folder;
|
return folder;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user