From 110303e2233ea9f54ef65419becaa18873d5dcbc Mon Sep 17 00:00:00 2001 From: "craig.p.drummond" Date: Sat, 12 Apr 2014 17:41:59 +0000 Subject: [PATCH] Fix cache and config folders for ubuntu touch. This only allows write access to ~/.local/share. So config is stored under ~/.local/share/$app/config and cache ~/.local/share/$app/cache --- support/utils.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/support/utils.cpp b/support/utils.cpp index a0552a634..476b5e805 100644 --- a/support/utils.cpp +++ b/support/utils.cpp @@ -663,7 +663,9 @@ static QString userDir(const QString &mainDir, const QString &sub, bool create) QString Utils::configDir(const QString &sub, bool create) { - #if defined Q_OS_WIN + #ifdef ENABLE_UBUNTU + return userDir(QDir::homePath()+"/local/share"+constDirSep+FOLDER_NAME+constDirSep+"config"+constDirSep, sub, create); + #elif defined Q_OS_WIN return userDir(QDesktopServices::storageLocation(QDesktopServices::DataLocation)+constDirSep, sub, create); #else QString env = qgetenv("XDG_CONFIG_HOME"); @@ -673,7 +675,9 @@ QString Utils::configDir(const QString &sub, bool create) QString Utils::dataDir(const QString &sub, bool create) { - #if defined Q_OS_WIN + #ifdef ENABLE_UBUNTU + return userDir(QDir::homePath()+"/local/share"+constDirSep+FOLDER_NAME+constDirSep, sub, create); + #elif defined Q_OS_WIN return userDir(QDesktopServices::storageLocation(QDesktopServices::DataLocation)+constDirSep, sub, create); #else QString env = qgetenv("XDG_DATA_HOME"); @@ -683,16 +687,14 @@ QString Utils::dataDir(const QString &sub, bool create) QString Utils::cacheDir(const QString &sub, bool create) { - #if defined Q_OS_WIN + #ifdef ENABLE_UBUNTU + return userDir(QDir::homePath()+"/local/share"+constDirSep+FOLDER_NAME+constDirSep+"config"+constDirSep, sub, create); + #elif defined Q_OS_WIN return userDir(QDesktopServices::storageLocation(QDesktopServices::CacheLocation)+constDirSep, sub, create); #else QString env = qgetenv("XDG_CACHE_HOME"); - #ifdef ENABLE_UBUNTU - return dataDir(".cache", create); - #else return userDir((env.isEmpty() ? QDir::homePath() + "/.cache" : env) + constDirSep+FOLDER_NAME+constDirSep, sub, create); #endif - #endif } bool Utils::moveFile(const QString &from, const QString &to)