--- generator/generator.pro.orig	2010-11-03 13:59:43.000000000 -0400
+++ generator/generator.pro	2010-11-03 13:59:59.000000000 -0400
@@ -23,5 +23,5 @@
         setupgenerator.cpp \
         docgenerator.cpp
 
-CONFIG -= debug
+CONFIG +=
 CONFIG += release
--- generator/generator.pri.orig	2010-11-03 13:59:49.000000000 -0400
+++ generator/generator.pri	2010-11-03 14:00:59.000000000 -0400
@@ -2,14 +2,12 @@
 INCLUDEPATH += $$GENERATORPATH
 
 TEMPLATE = app
-TARGET +=
+TARGET = generator
 DEPENDPATH += $$GENERATORPATH tests parser
 mac:CONFIG -= app_bundle
 INCLUDEPATH += $$GENERATORPATH/.
 INCLUDEPATH += $$GENERATORPATH/../common
 
-unix:CONFIG += debug_and_release
-
 CONFIG += console
 RESOURCES += generator.qrc
 
@@ -67,6 +65,10 @@
 }
 
 mac {
-    contains(QT_CONFIG, x86):contains(QT_CONFIG, ppc):CONFIG += x86 ppc
+    # generate just for the native arch, no others
+    CONFIG -= x86 x86_64 ppc ppc64
     CONFIG -= precompile_header
 }
+
+# execute the target after it is linked
+unix:QMAKE_POST_LINK=./$$TARGET
--- generator/qtscript_masterinclude.h.orig	2010-11-03 14:17:45.000000000 -0400
+++ generator/qtscript_masterinclude.h	2010-11-03 14:17:50.000000000 -0400
@@ -39,9 +39,7 @@
 #  include <QtWebKit/QtWebKit>
 #endif
 
-#ifndef QT_NO_PHONON
 #  include <phonon/phonon>
-#endif
 
 #include "../qtbindings/qtscript_core/qtscriptconcurrent.h"
 
