Mercurial > hg > easyhg

changeset 490:cd3dd285d0ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
OS/X build fixes
author Chris Cannam
date Thu, 18 Aug 2011 12:57:35 +0100
parents 86cdaa346e59
children 88c29b718702
files deploy/osx/deploy.sh src/hgrunner.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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"
 
--- 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