--- a/src/gui/util/qdesktopservices_mac.cpp	Tue Jan 26 12:42:25 2010 +0200
+++ b/src/gui/util/qdesktopservices_mac.cpp	Tue Feb 02 00:43:10 2010 +0200
@@ -153,9 +153,12 @@
 
     QString path = getFullPath(ref);
 
-    QString appName = QCoreApplication::applicationName();
-    if (!appName.isEmpty() && (type == DataLocation || type == CacheLocation))
-        path += QLatin1Char('/') + appName;
+    if (type == DataLocation || type == CacheLocation) {
+        if (QCoreApplication::organizationName().isEmpty() == false)
+            path += QLatin1Char('/') + QCoreApplication::organizationName();
+        if (QCoreApplication::applicationName().isEmpty() == false)
+            path += QLatin1Char('/') + QCoreApplication::applicationName();
+    }
 
     return path;
 }