Index: Qt/Core/pqPluginManager.cxx
===================================================================
RCS file: /cvsroot/ParaView3/ParaView3/Qt/Core/pqPluginManager.cxx,v
retrieving revision 1.32
diff -u -r1.32 pqPluginManager.cxx
--- Qt/Core/pqPluginManager.cxx	14 Jun 2008 01:05:18 -0000	1.32
+++ Qt/Core/pqPluginManager.cxx	20 Jun 2008 21:47:30 -0000
@@ -421,8 +421,17 @@
       {
       pv_plugin_path += ";";
       }
+#if defined (Q_OS_MAC)
+    //Look in the Application Package "ParaView.app/Contents/plugins
+    pv_plugin_path += QCoreApplication::applicationDirPath() + QDir::separator()
+      + "../plugins;";
+    //Look for a folder called "plugins" at the same level as ParaView.app
+    pv_plugin_path += QCoreApplication::applicationDirPath() + QDir::separator()
+      + "../../../plugins;";
+#else
     pv_plugin_path += QCoreApplication::applicationDirPath() + QDir::separator()
       + "plugins";
+#endif
     }
   else
     {
@@ -469,7 +478,12 @@
 #endif
     }
 
-#if !defined(Q_OS_WIN)
+#if defined (Q_OS_MAC)
+  if(!settingsRoot.isEmpty())
+    {
+    settingsRoot += "/Library/Application Support";
+    }
+#elif !defined(Q_OS_WIN) 
   if(!settingsRoot.isEmpty())
     {
     settingsRoot += "/.config";