# HG changeset patch
# User Chris Cannam
# Date 1313668655 -3600
# Node ID cd3dd285d0ffca0c0c8b477b5a3e74a44abeb1a2
# Parent  86cdaa346e59735654cf2b9e545f2ebe46f6bb7e
OS/X build fixes

diff -r 86cdaa346e59 -r cd3dd285d0ff deploy/osx/deploy.sh
--- a/deploy/osx/deploy.sh	Wed Aug 17 22:13:51 2011 +0100
+++ b/deploy/osx/deploy.sh	Thu Aug 18 12:57:35 2011 +0100
@@ -30,7 +30,7 @@
 mkdir "$volume" || exit 1
 
 ln -s /Applications "$volume"/Applications
-cp -rp "$source" "$target"
+cp -RPp "$source" "$target"
 
 echo "Done"
 
diff -r 86cdaa346e59 -r cd3dd285d0ff src/hgrunner.cpp
--- a/src/hgrunner.cpp	Wed Aug 17 22:13:51 2011 +0100
+++ b/src/hgrunner.cpp	Thu Aug 18 12:57:35 2011 +0100
@@ -543,7 +543,7 @@
 #endif
 
 #ifdef Q_OS_MAC
-    if (settings.value("python32", false).toBool()) {
+    if (QSettings().value("python32", false).toBool()) {
         env.insert("VERSIONER_PYTHON_PREFER_32_BIT", "1");
     }
 #endif