Mercurial > hg > svcore
changeset 739:51d3b8e816b8
Merge from branch "dataquay". Next release will require Dataquay v0.9
| author | Chris Cannam |
|---|---|
| date | Fri, 25 May 2012 14:58:21 +0100 |
| parents | 66c3f4e060e9 (diff) 547b03533375 (current diff) |
| children | e22b6e89a7f7 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/base/ResourceFinder.cpp Fri May 25 14:57:14 2012 +0100 +++ b/base/ResourceFinder.cpp Fri May 25 14:58:21 2012 +0100 @@ -75,8 +75,7 @@ } #else #ifdef Q_OS_MAC - list << QString("/Library/Application Support/%1/%2") - .arg(qApp->organizationName()) + list << QString("/Library/Application Support/%1") .arg(qApp->applicationName()); #else list << QString("/usr/local/share/%1") @@ -107,9 +106,8 @@ char *home = getenv("HOME"); if (!home || !home[0]) return ""; #ifdef Q_OS_MAC - return QString("%1/Library/Application Support/%2/%3") + return QString("%1/Library/Application Support/%2") .arg(home) - .arg(qApp->organizationName()) .arg(qApp->applicationName()); #else return QString("%1/.local/share/%2")
--- a/base/TempDirectory.cpp Fri May 25 14:57:14 2012 +0100 +++ b/base/TempDirectory.cpp Fri May 25 14:58:21 2012 +0100 @@ -72,7 +72,7 @@ } if (!QFileInfo(svDir).exists()) { - if (!QDir(svDirParent).mkdir(svDir)) { + if (!QDir(svDirParent).mkpath(svDir)) { throw DirectoryCreationFailed(QString("%1 directory in %2") .arg(svDir).arg(svDirParent)); }