# HG changeset patch
# User Chris Cannam
# Date 1313669758 -3600
# Node ID 88c29b718702a66e9c6f211bcc1b2499e2811ec2
# Parent  1d90cd7a1c5f9cdcb434df7e8dbcc0cac010f12e# Parent  cd3dd285d0ffca0c0c8b477b5a3e74a44abeb1a2
Merge

diff -r 1d90cd7a1c5f -r 88c29b718702 deploy/osx/deploy.sh
--- a/deploy/osx/deploy.sh	Thu Aug 18 13:15:38 2011 +0100
+++ b/deploy/osx/deploy.sh	Thu Aug 18 13:15:58 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 1d90cd7a1c5f -r 88c29b718702 src/hgrunner.cpp
--- a/src/hgrunner.cpp	Thu Aug 18 13:15:38 2011 +0100
+++ b/src/hgrunner.cpp	Thu Aug 18 13:15:58 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