# HG changeset patch
# User Chris Cannam
# Date 1337789837 -3600
# Node ID 66c3f4e060e965fee1bfd6f14910617c6c23c8f9
# Parent  7eb389da797649c63566a6fa90ca016bd71f209b# Parent  b867c07478befa11e5ae3dc03c0baba0e4c7687a
Merge

diff -r 7eb389da7976 -r 66c3f4e060e9 base/ResourceFinder.cpp
--- 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")
diff -r 7eb389da7976 -r 66c3f4e060e9 base/TempDirectory.cpp
--- 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));
         }