diff --git a/boost.pri b/boost.pri
index 2084c892..c4eed88b 100644
--- a/boost.pri
+++ b/boost.pri
@@ -9,6 +9,8 @@ boost {
     win*: QMAKE_LIBDIR += -L$$BOOST_DIR/lib
   }
 
+  # See https://svn.boost.org/trac/boost/ticket/6219
+  macx: DEFINES += __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0
   CONFIG(mingw-cross-env) {
     DEFINES += BOOST_STATIC
     DEFINES += BOOST_THREAD_USE_LIB
diff --git a/setenv_mac-qt5.sh b/setenv_mac-qt5.sh
new file mode 100644
index 00000000..d7b4338d
--- /dev/null
+++ b/setenv_mac-qt5.sh
@@ -0,0 +1,10 @@
+export OPENSCAD_LIBRARIES=$PWD/../libraries/homebrew
+export DYLD_LIBRARY_PATH=$OPENSCAD_LIBRARIES/lib
+export DYLD_FRAMEWORK_PATH=$OPENSCAD_LIBRARIES/lib
+
+# Our own Qt
+export PATH=$OPENSCAD_LIBRARIES/bin:$PATH
+
+# ccache:
+export PATH=/opt/local/libexec/ccache:$PATH
+export CCACHE_BASEDIR=$PWD/..
diff --git a/src/AppleEvents.cc b/src/AppleEvents.cc
index 3102792c..39aba9dd 100644
--- a/src/AppleEvents.cc
+++ b/src/AppleEvents.cc
@@ -24,7 +24,7 @@ void installAppleEventHandlers()
 {
 	// Reload handler
   OSErr err = AEInstallEventHandler('SCAD', 'relo', NewAEEventHandlerUPP(eventHandler), 0, true);
-  require_noerr(err, CantInstallAppleEventHandler);
+  __Require_noErr(err, CantInstallAppleEventHandler);
 	return;
 
 CantInstallAppleEventHandler: