Mercurial > hg > svcore

changeset 735:66c3f4e060e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Wed, 23 May 2012 17:17:17 +0100
parents 7eb389da7976 (current diff) b867c07478be (diff)
children 51d3b8e816b8
files base/ResourceFinder.cpp
diffstat 2 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/base/ResourceFinder.cpp	Fri May 18 09:48:19 2012 +0100
+++ b/base/ResourceFinder.cpp	Wed May 23 17:17:17 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 18 09:48:19 2012 +0100
+++ b/base/TempDirectory.cpp	Wed May 23 17:17:17 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));
         }