# HG changeset patch
# User Chris Cannam
# Date 1337954301 -3600
# Node ID 51d3b8e816b82ba7247466400859d34615cafef5
# Parent  66c3f4e060e965fee1bfd6f14910617c6c23c8f9# Parent  547b0353337576bc07ffc65649e8aa8b3dd360c8
Merge from branch "dataquay". Next release will require Dataquay v0.9

diff -r 547b03533375 -r 51d3b8e816b8 base/ResourceFinder.cpp
--- 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")
diff -r 547b03533375 -r 51d3b8e816b8 base/TempDirectory.cpp
--- 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));
         }