# 
# 
# patch "guitone/guitone.pro"
#  from [2c8b0b11f17abe08d4cd7dccfe949533fea78d3c]
#    to [c3cd9a2364eac94fa842a67541f29c2fb8174a1c]
# 
============================================================
--- guitone/guitone.pro	2c8b0b11f17abe08d4cd7dccfe949533fea78d3c
+++ guitone/guitone.pro	c3cd9a2364eac94fa842a67541f29c2fb8174a1c
@@ -70,22 +70,23 @@ macx {
 #
 
 macx {
-        # copy i18n resources into the final app bundle
-        QMAKE_POST_LINK = cp -R res/osx/Resources bin/guitone.app/Contents
+    # copy i18n resources into the final app bundle
+    QMAKE_POST_LINK = cp -R res/osx/Resources bin/guitone.app/Contents
 
-        # osx application icon
-        ICON = res/osx/guitone.icns
+    # osx application icon
+    ICON = res/osx/guitone.icns
 
-	# set this to either ppc or i386 or both if you want to create
-	# a PowerPC, x86 or Universal OSX binary
-	debug {
-		CONFIG += x86
-	}
-	release {
-		CONFIG += x86
-	}
-	# path to the OSX universal SDK
-	QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
+    # add x86, ppc or both to build for either or both platforms (universal)^
+    CONFIG += ppc x86
+    
+    # do not try to build a universal binary if precompiled headers
+    # are enabled (this will fail badly)
+    contains(CONFIG, precompile_header):contains(CONFIG, x86):contains(CONFIG, ppc) {
+        warning(Disabling precompiled headers for universal builds.)
+        CONFIG -= precompile_header
+    }
+    
+    QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
 }
 
 #
@@ -100,7 +101,7 @@ macx | unix {
 macx | unix {
     LIBS = -L$${MYQANAVADIR}/build \
            -lqanava_la -lqanava_can -lqanava_ui -lqanava_utl
-    DEFINES += QANAVA_UNIX
+    DEFINES += QANAVA_LINUX^
 }
 win32:LIBS = $${MYQANAVADIR}/build/qanava_la.lib \
              $${MYQANAVADIR}/build/qanava_can.lib \