Index: common.pri
===================================================================
--- common.pri	(revision 174)
+++ common.pri	(working copy)
@@ -8,7 +8,7 @@
 
 # HACK: use qca from psi if necessary
 qca-static {
-	INCLUDEPATH += $$PWD/../third-party/qca/include/QtCrypto
+	INCLUDEPATH += $$PWD/../third-party/qca/qca/include/QtCrypto
 }
 
 # HACK: use zlib from psi if necessary
@@ -16,6 +16,16 @@
 	INCLUDEPATH += $$PWD/../src/tools/zip/minizip/win32
 }
 
+mac {
+	# Universal binaries
+	qc_universal:contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {
+		CONFIG += x86 ppc
+		QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
+		QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
+	}
+}
+
+
 # default build configuration
 !iris_build_pri {
 	# build appledns on mac
Index: iris.pro
===================================================================
--- iris.pro	(revision 174)
+++ iris.pro	(working copy)
@@ -2,6 +2,7 @@
 
 include(common.pri)
 
+
 # do we have a reason to enter the src dir?
 appledns:!appledns_bundle:CONFIG *= build_src
 !irisnetcore_bundle:CONFIG *= build_src