From 6a2967a1f423115a15e619235414124930579359 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 11 Mar 2013 10:24:55 -0400
Subject: Qt fixes for clang


diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh
index e208fdd..a6963a4 100755
--- a/scripts/macosx-build-dependencies.sh
+++ b/scripts/macosx-build-dependencies.sh
@@ -51,6 +51,10 @@ build_qt()
   fi
   tar xzf qt-everywhere-opensource-src-$version.tar.gz
   cd qt-everywhere-opensource-src-$version
+  if $OPTION_CLANG; then
+    # FIX for clang
+    sed -i "" -e "s/::TabletProximityRec/TabletProximityRec/g"  src/gui/kernel/qt_cocoa_helpers_mac_p.h
+  fi
   if $OPTION_32BIT; then
     QT_32BIT="-arch x86"
   fi
diff --git a/setenv_mac-clang.sh b/setenv_mac-clang.sh
index 0dcc51f..7d968e8 100644
--- a/setenv_mac-clang.sh
+++ b/setenv_mac-clang.sh
@@ -1,11 +1,15 @@
 export OPENSCAD_LIBRARIES=$PWD/../libraries/install
 export DYLD_LIBRARY_PATH=$OPENSCAD_LIBRARIES/lib
+export DYLD_FRAMEWORK_PATH=$OPENSCAD_LIBRARIES/lib
 export QMAKESPEC=unsupported/macx-clang
 
 #export OPENCSGDIR=$PWD/../OpenCSG-1.3.0
 #export CGALDIR=$PWD/../install/CGAL-3.6
 #export DYLD_LIBRARY_PATH=$OPENCSGDIR/lib
 
+# Our own Qt
+export PATH=$OPENSCAD_LIBRARIES/bin:$PATH
+
 # ccache:
 export PATH=/opt/local/libexec/ccache:$PATH
 export CCACHE_BASEDIR=$PWD/..
-- 
cgit v0.10.1