diff -Naur qt-no-xcode4/mkspecs/features/mac/objective_c.prf qt-everywhere-opensource-src-4.7.3/mkspecs/features/mac/objective_c.prf
--- qt-no-xcode4/mkspecs/features/mac/objective_c.prf	2011-03-30 16:16:35.000000000 +1100
+++ qt-everywhere-opensource-src-4.7.3/mkspecs/features/mac/objective_c.prf	2011-05-19 10:55:34.000000000 +1000
@@ -19,5 +19,6 @@
 objective_c.output = $$OBJECTIVE_C_OBJECTS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
 objective_c.input = OBJECTIVE_SOURCES
 objective_c.name = Compile ${QMAKE_FILE_IN}
+objective_c.skip_preprocess = 1
 silent:objective_c.commands = @echo objective-c ${QMAKE_FILE_IN} && $$objective_c.commands
 QMAKE_EXTRA_COMPILERS += objective_c
diff -Naur qt-no-xcode4/qmake/generators/mac/pbuilder_pbx.cpp qt-everywhere-opensource-src-4.7.3/qmake/generators/mac/pbuilder_pbx.cpp
--- qt-no-xcode4/qmake/generators/mac/pbuilder_pbx.cpp	2011-03-30 16:15:42.000000000 +1100
+++ qt-everywhere-opensource-src-4.7.3/qmake/generators/mac/pbuilder_pbx.cpp	2011-05-19 11:06:45.000000000 +1000
@@ -751,6 +751,8 @@
                 mkt << "compilers:";
                 const QStringList &compilers = project->values("QMAKE_EXTRA_COMPILERS");
                 for(int compiler = 0; compiler < compilers.size(); ++compiler) {
+                   if(!project->isEmpty(compilers.at(compiler) + ".skip_preprocess"))
+                       continue;
                     QString tmp_out = project->first(compilers.at(compiler) + ".output");
                     if(project->isEmpty(compilers.at(compiler) + ".output"))
                         continue;
@@ -1013,6 +1015,7 @@
           << "\t\t\t" << writeSettings("name", escapeFilePath(grp)) << ";" << "\n"
           << "\t\t" << "};" << "\n";
     }
+    if (pbVersion < 46)
     { //INSTALL BUILDPHASE (copy)
         QString phase_key = keyFor("QMAKE_PBX_TARGET_COPY_PHASE");
         QString destDir = Option::output_dir;
@@ -1200,188 +1203,49 @@
           << "\t\t\t" << writeSettings("refType", "4", SettingsNoQuote) << ";" << "\n"
           << "\t\t" << "};" << "\n";
     }
+    if (pbVersion >= 46 )
+    {
+	    for(int as_release = 0; as_release < 3; as_release++)
+    	{
+	        QString name = (as_release ? (as_release > 1 ? "Default" : "Release") : "Debug");
+            QString key = keyFor("QMAKE_TARGET_BUILDCONFIG_" + name);
+            project->values("QMAKE_TARGET_BUILDCONFIGS").append(key);
+            t << "\t\t" << key << " = {" << "\n"
+              << "\t\t\t" << writeSettings("isa", "XCBuildConfiguration", SettingsNoQuote) << ";" << "\n";
+    		writeTargetBuildSettings(pbVersion, t);
+            t << "\t\t\t" << writeSettings("name", name) << ";" << "\n"
+              << "\t\t" << "};" << "\n";
+    	}
+        t << "\t\t" << keyFor("QMAKE_TARGET_BUILDCONFIG_LIST") << " = {" << "\n"
+          << "\t\t\t" << writeSettings("isa", "XCConfigurationList", SettingsNoQuote) << ";" << "\n"
+          << "\t\t\t" << writeSettings("buildConfigurations", project->values("QMAKE_TARGET_BUILDCONFIGS"), SettingsAsList, 4) << ";" << "\n"
+          << "\t\t\t" << writeSettings("defaultConfigurationIsVisible", "0", SettingsNoQuote) << ";" << "\n";
+          t << "\t\t\t" << writeSettings("defaultConfigurationName", "Default") << ";" << "\n";
+        t << "\t\t" << "};" << "\n";
+    }
     //TARGET
     QString target_key = keyFor(pbx_dir + "QMAKE_PBX_TARGET");
     project->values("QMAKE_PBX_TARGETS").append(target_key);
     t << "\t\t" << target_key << " = {" << "\n"
       << "\t\t\t" << writeSettings("buildPhases", project->values("QMAKE_PBX_PRESCRIPT_BUILDPHASES") + project->values("QMAKE_PBX_BUILDPHASES"),
-                                   SettingsAsList, 4) << ";" << "\n"
-      << "\t\t\t" << "buildSettings = {" << "\n";
-    QString cCompiler = project->first("QMAKE_CC");
-    if (!cCompiler.isEmpty()) {
-        t << "\t\t\t\t" << writeSettings("CC", fixForOutput(findProgram(cCompiler))) << ";" << "\n";
-    }
-    cCompiler = project->first("QMAKE_CXX");
-    if (!cCompiler.isEmpty()) {
-        t << "\t\t\t\t" << writeSettings("CPLUSPLUS", fixForOutput(findProgram(cCompiler))) << ";" << "\n";
-    }
-
-    t << "\t\t\t\t" << writeSettings("HEADER_SEARCH_PATHS", fixListForOutput("INCLUDEPATH") + QStringList(fixForOutput(specdir())), SettingsAsList, 5) << ";" << "\n"
-      << "\t\t\t\t" << writeSettings("LIBRARY_SEARCH_PATHS", fixListForOutput("QMAKE_PBX_LIBPATHS"), SettingsAsList, 5) << ";" << "\n"
-      << "\t\t\t\t" << writeSettings("OPTIMIZATION_CFLAGS", QStringList(), SettingsAsList, 5) << ";" << "\n";
+                                   SettingsAsList, 4) << ";" << "\n";
+    if (pbVersion >= 46 )
     {
-        QStringList cflags = fixListForOutput("QMAKE_CFLAGS");
-        const QStringList &prl_defines = project->values("PRL_EXPORT_DEFINES");
-        for(int i = 0; i < prl_defines.size(); ++i)
-            cflags += "-D" + prl_defines.at(i);
-        const QStringList &defines = project->values("DEFINES");
-        for(int i = 0; i < defines.size(); ++i)
-            cflags += "-D" + defines.at(i);
-        t << "\t\t\t\t" << writeSettings("OTHER_CFLAGS", cflags, SettingsAsList, 5) << ";" << "\n";
+	    t << "\t\t\t" << writeSettings("buildConfigurationList", keyFor("QMAKE_TARGET_BUILDCONFIG_LIST")) << ";" << "\n";
     }
-    {
-        QStringList cxxflags = fixListForOutput("QMAKE_CXXFLAGS");
-        const QStringList &prl_defines = project->values("PRL_EXPORT_DEFINES");
-        for(int i = 0; i < prl_defines.size(); ++i)
-            cxxflags += "-D" + prl_defines.at(i);
-        const QStringList &defines = project->values("DEFINES");
-        for(int i = 0; i < defines.size(); ++i)
-            cxxflags += "-D" + defines.at(i);
-        t << "\t\t\t\t" << writeSettings("OTHER_CPLUSPLUSFLAGS", cxxflags, SettingsAsList, 5) << ";" << "\n";
-    }
-    t << "\t\t\t\t" << writeSettings("LEXFLAGS", fixListForOutput("QMAKE_LEXFLAGS")) << ";" << "\n"
-      << "\t\t\t\t" << writeSettings("YACCFLAGS", fixListForOutput("QMAKE_YACCFLAGS")) << ";" << "\n"
-      << "\t\t\t\t" << writeSettings("OTHER_REZFLAGS", QStringList()) << ";" << "\n"
-      << "\t\t\t\t" << writeSettings("SECTORDER_FLAGS", QStringList()) << ";" << "\n"
-      << "\t\t\t\t" << writeSettings("WARNING_CFLAGS", QStringList()) << ";" << "\n"
-      << "\t\t\t\t" << writeSettings("PREBINDING", QStringList((project->isEmpty("QMAKE_DO_PREBINDING") ? "NO" : "YES")), SettingsNoQuote) << ";" << "\n";
-    if(!project->isEmpty("PRECOMPILED_HEADER")) {
-        if(pbVersion >= 38) {
-            t << "\t\t\t\t" << writeSettings("GCC_PRECOMPILE_PREFIX_HEADER", "YES") << ";" << "\n"
-              << "\t\t\t\t" << writeSettings("GCC_PREFIX_HEADER", escapeFilePath(project->first("PRECOMPILED_HEADER"))) << ";" << "\n";
-        } else {
-            t << "\t\t\t\t" << writeSettings("PRECOMPILE_PREFIX_HEADER", "YES") << ";" << "\n"
-              << "\t\t\t\t" << writeSettings("PREFIX_HEADER", escapeFilePath(project->first("PRECOMPILED_HEADER"))) << ";" << "\n";
-        }
-    }
-    if((project->first("TEMPLATE") == "app" && project->isActiveConfig("app_bundle")) ||
-       (project->first("TEMPLATE") == "lib" && !project->isActiveConfig("staticlib") &&
-        project->isActiveConfig("lib_bundle"))) {
-        QString plist = fileFixify(project->first("QMAKE_INFO_PLIST"));
-        if(plist.isEmpty())
-            plist = specdir() + QDir::separator() + "Info.plist." + project->first("TEMPLATE");
-        if(exists(plist)) {
-            QFile plist_in_file(plist);
-            if(plist_in_file.open(QIODevice::ReadOnly)) {
-                QTextStream plist_in(&plist_in_file);
-                QString plist_in_text = plist_in.readAll();
-                plist_in_text = plist_in_text.replace("@ICON@",
-                  (project->isEmpty("ICON") ? QString("") : project->first("ICON").section(Option::dir_sep, -1)));
-                if(project->first("TEMPLATE") == "app") {
-                    plist_in_text = plist_in_text.replace("@EXECUTABLE@", project->first("QMAKE_ORIG_TARGET"));
-                } else {
-                    plist_in_text = plist_in_text.replace("@LIBRARY@", project->first("QMAKE_ORIG_TARGET"));
-                    plist_in_text = plist_in_text.replace("@SHORT_VERSION@", project->first("VER_MAJ") + "." +
-                                                          project->first("VER_MIN"));
-                }
-                plist_in_text = plist_in_text.replace("@TYPEINFO@",
-                  (project->isEmpty("QMAKE_PKGINFO_TYPEINFO") ? QString::fromLatin1("????") :
-                   project->first("QMAKE_PKGINFO_TYPEINFO").left(4)));
-                QFile plist_out_file("Info.plist");
-                if(plist_out_file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-                    QTextStream plist_out(&plist_out_file);
-                    plist_out << plist_in_text;
-                    t << "\t\t\t\t" << writeSettings("INFOPLIST_FILE", "Info.plist") << ";" << "\n";
-                }
-            }
-        }
-    }
-#if 1
-    t << "\t\t\t\t" << writeSettings("BUILD_ROOT", escapeFilePath(qmake_getpwd())) << ";" << "\n";
-#endif
-    if(!project->isActiveConfig("staticlib")) {
-        t << "\t\t\t\t" << writeSettings("OTHER_LDFLAGS",
-                                         fixListForOutput("SUBLIBS")
-                                         + fixListForOutput("QMAKE_LFLAGS")
-                                         + fixListForOutput("QMAKE_LIBDIR_FLAGS")
-                                         + fixListForOutput("QMAKE_FRAMEWORKPATH_FLAGS")
-                                         + fixListForOutput("QMAKE_LIBS"),
-                                         SettingsAsList, 6) << ";" << "\n";
-    }
-    if(!project->isEmpty("DESTDIR")) {
-        QString dir = project->first("DESTDIR");
-        if (QDir::isRelativePath(dir))
-            dir.prepend(qmake_getpwd() + Option::dir_sep);
-        t << "\t\t\t\t" << writeSettings("INSTALL_DIR", dir) << ";" << "\n";
-    }
-    if (project->first("TEMPLATE") == "lib") {
-        t << "\t\t\t\t" << writeSettings("INSTALL_PATH", QStringList()) << ";" << "\n";
-    }
-    if(!project->isEmpty("VERSION") && project->first("VERSION") != "0.0.0") {
-        t << "\t\t\t\t" << writeSettings("DYLIB_CURRENT_VERSION",  project->first("VER_MAJ")+"."+project->first("VER_MIN")+"."+project->first("VER_PAT")) << ";" << "\n";
-        if(project->isEmpty("COMPAT_VERSION"))
-            t << "\t\t\t\t" << writeSettings("DYLIB_COMPATIBILITY_VERSION", project->first("VER_MAJ")+"."+project->first("VER_MIN")) << ";" << "\n";
-        if(project->first("TEMPLATE") == "lib" && !project->isActiveConfig("staticlib") &&
-           project->isActiveConfig("lib_bundle"))
-            t << "\t\t\t\t" << writeSettings("FRAMEWORK_VERSION", project->first("QMAKE_FRAMEWORK_VERSION")) << ";" << "\n";
-    }
-    if(!project->isEmpty("COMPAT_FRAMEWORKPATH"))
-        t << "\t\t\t\t" << writeSettings("FRAMEWORK_SEARCH_PATHS", fixListForOutput("QMAKE_FRAMEWORKPATH"), SettingsAsList, 5) << ";" << "\n";
-    if(!project->isEmpty("COMPAT_VERSION"))
-        t << "\t\t\t\t" << writeSettings("DYLIB_COMPATIBILITY_VERSION", project->first("COMPAT_VERSION")) << ";" << "\n";
-    if(!project->isEmpty("QMAKE_MACOSX_DEPLOYMENT_TARGET"))
-        t << "\t\t\t\t" << writeSettings("MACOSX_DEPLOYMENT_TARGET", project->first("QMAKE_MACOSX_DEPLOYMENT_TARGET")) << ";" << "\n";
-    if(pbVersion >= 38) {
-        if(!project->isEmpty("OBJECTS_DIR"))
-            t << "\t\t\t\t" << writeSettings("OBJROOT", fixForOutput(project->first("OBJECTS_DIR"))) << ";" << "\n";
-    }
-#if 0
-    if(!project->isEmpty("DESTDIR"))
-        t << "\t\t\t\t" << writeSettings("SYMROOT", fixForOutput(project->first("DESTDIR"))) << ";" << "\n";
     else
-        t << "\t\t\t\t" << writeSettings("SYMROOT", fixForOutput(qmake_getpwd())) << ";" << "\n";
-#endif
     {
-        QStringList archs;
-        if(project->isActiveConfig("x86"))
-            archs += "i386";
-        if(project->isActiveConfig("ppc")) {
-            if(!archs.isEmpty())
-                archs += " ";
-            archs += "ppc";
-        }
-        if(project->isActiveConfig("ppc64")) {
-            if(!archs.isEmpty())
-                archs += " ";
-            archs += "ppc64";
-        }
-        if(project->isActiveConfig("x86_64")) {
-            if(!archs.isEmpty())
-                archs += " ";
-            archs += "x86_64";
-        }
-        if(!archs.isEmpty())
-            t << "\t\t\t\t" << writeSettings("ARCHS", archs) << ";" << "\n";
-
-    }
-    if(project->first("TEMPLATE") == "app") {
-        if(pbVersion < 38 && project->isActiveConfig("app_bundle"))
-            t << "\t\t\t\t" << writeSettings("WRAPPER_SUFFIX", "app") << ";" << "\n";
-        t << "\t\t\t\t" << writeSettings("PRODUCT_NAME", fixForOutput(project->first("QMAKE_ORIG_TARGET"))) << ";" << "\n";
-    } else {
-        if(!project->isActiveConfig("plugin") && project->isActiveConfig("staticlib")) {
-            t << "\t\t\t\t" << writeSettings("LIBRARY_STYLE", "STATIC") << ";" << "\n";
-        } else {
-            t << "\t\t\t\t" << writeSettings("LIBRARY_STYLE", "DYNAMIC") << ";" << "\n";
-        }
-        QString lib = project->first("QMAKE_ORIG_TARGET");
-        if(!project->isActiveConfig("lib_bundle") && !project->isActiveConfig("staticlib"))
-            lib.prepend("lib");
-        t << "\t\t\t\t" << writeSettings("PRODUCT_NAME", escapeFilePath(lib)) << ";" << "\n";
-    }
-    tmp = project->values("QMAKE_PBX_VARS");
-    for(int i = 0; i < tmp.count(); i++) {
-        QString var = tmp[i], val = qgetenv(var.toLatin1());
-        if(val.isEmpty() && var == "TB")
-            val = "/usr/bin/";
-        t << "\t\t\t\t" << writeSettings(var, escapeFilePath(val)) << ";" << "\n";
-    }
-    t << "\t\t\t" << "};" << "\n"
-      << "\t\t\t" << "conditionalBuildSettings = {" << "\n"
-      << "\t\t\t" << "};" << "\n"
-      << "\t\t\t" << writeSettings("dependencies", project->values("QMAKE_PBX_TARGET_DEPENDS"), SettingsAsList, 4) << ";" << "\n"
-      << "\t\t\t" << writeSettings("productReference", keyFor(pbx_dir + "QMAKE_PBX_REFERENCE")) << ";" << "\n"
-      << "\t\t\t" << writeSettings("shouldUseHeadermap", "1", SettingsNoQuote) << ";" << "\n";
+	   	writeTargetBuildSettings(pbVersion, t);
+	}
+    if (pbVersion < 46)
+    {
+	    t << "\t\t\t" << "conditionalBuildSettings = {" << "\n"
+    	  << "\t\t\t" << "};" << "\n";
+   	}
+    t << "\t\t\t" << writeSettings("dependencies", project->values("QMAKE_PBX_TARGET_DEPENDS"), SettingsAsList, 4) << ";" << "\n"
+      << "\t\t\t" << writeSettings("productReference", keyFor(pbx_dir + "QMAKE_PBX_REFERENCE")) << ";" << "\n";
+    if (pbVersion < 46)
+    	t << "\t\t\t" << writeSettings("shouldUseHeadermap", "1", SettingsNoQuote) << ";" << "\n";
     if(pbVersion >= 38)
         t << "\t\t\t" << writeSettings("isa", "PBXNativeTarget", SettingsNoQuote) << ";" << "\n";
     if(project->first("TEMPLATE") == "app") {
@@ -1465,7 +1329,8 @@
             t << "\t\t\t" << writeSettings("isa", "PBXLibraryTarget", SettingsNoQuote) << ";" << "\n";
         }
     }
-    t << "\t\t\t" << writeSettings("startupPath", "<<ProjectDirectory>>") << ";" << "\n";
+    if (pbVersion < 46)
+	    t << "\t\t\t" << writeSettings("startupPath", "<<ProjectDirectory>>") << ";" << "\n";
     if(!project->isEmpty("DESTDIR"))
         t << "\t\t\t" << writeSettings("productInstallPath", escapeFilePath(project->first("DESTDIR"))) << ";" << "\n";
     t << "\t\t" << "};" << "\n";
@@ -1530,14 +1395,20 @@
         t << "\t\t" << keyFor("QMAKE_PBX_BUILDCONFIG_LIST") << " = {" << "\n"
           << "\t\t\t" << writeSettings("isa", "XCConfigurationList", SettingsNoQuote) << ";" << "\n"
           << "\t\t\t" << writeSettings("buildConfigurations", project->values("QMAKE_PBX_BUILDCONFIGS"), SettingsAsList, 4) << ";" << "\n"
-          << "\t\t\t" << writeSettings("defaultConfigurationIsVisible", "0", SettingsNoQuote) << ";" << "\n"
-          << "\t\t\t" << writeSettings("defaultConfigurationIsName", active_buildstyle) << ";" << "\n"
-          << "\t\t" << "};" << "\n";
+          << "\t\t\t" << writeSettings("defaultConfigurationIsVisible", "0", SettingsNoQuote) << ";" << "\n";
+        if (pbVersion >= 46 )
+          t << "\t\t\t" << writeSettings("defaultConfigurationName", active_buildstyle) << ";" << "\n";
+        else
+          t << "\t\t\t" << writeSettings("defaultConfigurationIsName", active_buildstyle) << ";" << "\n";
+        t << "\t\t" << "};" << "\n";
     }
     //ROOT
-    t << "\t\t" << keyFor("QMAKE_PBX_ROOT") << " = {" << "\n"
-      << "\t\t\t" << writeSettings("buildStyles", project->values("QMAKE_PBX_BUILDSTYLES"), SettingsAsList, 4) << ";" << "\n"
-      << "\t\t\t" << writeSettings("hasScannedForEncodings", "1", SettingsNoQuote) << ";" << "\n"
+    t << "\t\t" << keyFor("QMAKE_PBX_ROOT") << " = {" << "\n";
+    if(pbVersion >= 46)
+    	t << "\t\t\t" << writeSettings("compatibilityVersion", "Xcode 3.2") << ";" << "\n";
+    else
+       t << "\t\t\t" << writeSettings("buildStyles", project->values("QMAKE_PBX_BUILDSTYLES"), SettingsAsList, 4) << ";" << "\n";
+    t << "\t\t\t" << writeSettings("hasScannedForEncodings", "1", SettingsNoQuote) << ";" << "\n"
       << "\t\t\t" << writeSettings("isa", "PBXProject", SettingsNoQuote) << ";" << "\n"
       << "\t\t\t" << writeSettings("mainGroup", keyFor("QMAKE_PBX_ROOT_GROUP")) << ";" << "\n";
     if(pbVersion >= 42)
@@ -1579,6 +1450,172 @@
     return true;
 }
 
+void ProjectBuilderMakefileGenerator::writeTargetBuildSettings(int pbVersion, QTextStream &t)
+{
+	t << "\t\t\t" << "buildSettings = {" << "\n";
+	QString cCompiler = project->first("QMAKE_CC");
+	if (!cCompiler.isEmpty()) {
+		t << "\t\t\t\t" << writeSettings("CC", fixForOutput(findProgram(cCompiler))) << ";" << "\n";
+	}
+	cCompiler = project->first("QMAKE_CXX");
+	if (!cCompiler.isEmpty()) {
+		t << "\t\t\t\t" << writeSettings("CPLUSPLUS", fixForOutput(findProgram(cCompiler))) << ";" << "\n";
+	}
+	
+	t << "\t\t\t\t" << writeSettings("HEADER_SEARCH_PATHS", fixListForOutput("INCLUDEPATH") + QStringList(fixForOutput(specdir())), SettingsAsList, 5) << ";" << "\n"
+	  << "\t\t\t\t" << writeSettings("LIBRARY_SEARCH_PATHS", fixListForOutput("QMAKE_PBX_LIBPATHS"), SettingsAsList, 5) << ";" << "\n"
+	  << "\t\t\t\t" << writeSettings("OPTIMIZATION_CFLAGS", QStringList(), SettingsAsList, 5) << ";" << "\n";
+	{
+		QStringList cflags = fixListForOutput("QMAKE_CFLAGS");
+		const QStringList &prl_defines = project->values("PRL_EXPORT_DEFINES");
+		for(int i = 0; i < prl_defines.size(); ++i)
+			cflags += "-D" + prl_defines.at(i);
+		const QStringList &defines = project->values("DEFINES");
+		for(int i = 0; i < defines.size(); ++i)
+			cflags += "-D" + defines.at(i);
+		t << "\t\t\t\t" << writeSettings("OTHER_CFLAGS", cflags, SettingsAsList, 5) << ";" << "\n";
+	}
+	{
+		QStringList cxxflags = fixListForOutput("QMAKE_CXXFLAGS");
+		const QStringList &prl_defines = project->values("PRL_EXPORT_DEFINES");
+		for(int i = 0; i < prl_defines.size(); ++i)
+			cxxflags += "-D" + prl_defines.at(i);
+		const QStringList &defines = project->values("DEFINES");
+		for(int i = 0; i < defines.size(); ++i)
+			cxxflags += "-D" + defines.at(i);
+		t << "\t\t\t\t" << writeSettings("OTHER_CPLUSPLUSFLAGS", cxxflags, SettingsAsList, 5) << ";" << "\n";
+	}
+	t << "\t\t\t\t" << writeSettings("LEXFLAGS", fixListForOutput("QMAKE_LEXFLAGS")) << ";" << "\n"
+	  << "\t\t\t\t" << writeSettings("YACCFLAGS", fixListForOutput("QMAKE_YACCFLAGS")) << ";" << "\n"
+	  << "\t\t\t\t" << writeSettings("OTHER_REZFLAGS", QStringList()) << ";" << "\n"
+	  << "\t\t\t\t" << writeSettings("SECTORDER_FLAGS", QStringList()) << ";" << "\n"
+	  << "\t\t\t\t" << writeSettings("WARNING_CFLAGS", QStringList()) << ";" << "\n"
+	  << "\t\t\t\t" << writeSettings("PREBINDING", QStringList((project->isEmpty("QMAKE_DO_PREBINDING") ? "NO" : "YES")), SettingsNoQuote) << ";" << "\n";
+	if(!project->isEmpty("PRECOMPILED_HEADER")) {
+			t << "\t\t\t\t" << writeSettings("GCC_PRECOMPILE_PREFIX_HEADER", "YES") << ";" << "\n"
+			  << "\t\t\t\t" << writeSettings("GCC_PREFIX_HEADER", escapeFilePath(project->first("PRECOMPILED_HEADER"))) << ";" << "\n";
+	}
+	if((project->first("TEMPLATE") == "app" && project->isActiveConfig("app_bundle")) ||
+	   (project->first("TEMPLATE") == "lib" && !project->isActiveConfig("staticlib") &&
+		project->isActiveConfig("lib_bundle"))) {
+		QString plist = fileFixify(project->first("QMAKE_INFO_PLIST"));
+		if(plist.isEmpty())
+			plist = specdir() + QDir::separator() + "Info.plist." + project->first("TEMPLATE");
+		if(exists(plist)) {
+			QFile plist_in_file(plist);
+			if(plist_in_file.open(QIODevice::ReadOnly)) {
+				QTextStream plist_in(&plist_in_file);
+				QString plist_in_text = plist_in.readAll();
+				plist_in_text = plist_in_text.replace("@ICON@",
+				  (project->isEmpty("ICON") ? QString("") : project->first("ICON").section(Option::dir_sep, -1)));
+				if(project->first("TEMPLATE") == "app") {
+					plist_in_text = plist_in_text.replace("@EXECUTABLE@", project->first("QMAKE_ORIG_TARGET"));
+				} else {
+					plist_in_text = plist_in_text.replace("@LIBRARY@", project->first("QMAKE_ORIG_TARGET"));
+					plist_in_text = plist_in_text.replace("@SHORT_VERSION@", project->first("VER_MAJ") + "." +
+														  project->first("VER_MIN"));
+				}
+				plist_in_text = plist_in_text.replace("@TYPEINFO@",
+				  (project->isEmpty("QMAKE_PKGINFO_TYPEINFO") ? QString::fromLatin1("????") :
+				   project->first("QMAKE_PKGINFO_TYPEINFO").left(4)));
+				QFile plist_out_file("Info.plist");
+				if(plist_out_file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+					QTextStream plist_out(&plist_out_file);
+					plist_out << plist_in_text;
+					t << "\t\t\t\t" << writeSettings("INFOPLIST_FILE", "Info.plist") << ";" << "\n";
+				}
+			}
+		}
+	}
+#if 1
+	t << "\t\t\t\t" << writeSettings("BUILD_ROOT", escapeFilePath(qmake_getpwd())) << ";" << "\n";
+#endif
+	if(!project->isActiveConfig("staticlib")) {
+		t << "\t\t\t\t" << writeSettings("OTHER_LDFLAGS",
+										 fixListForOutput("SUBLIBS")
+										 + fixListForOutput("QMAKE_LFLAGS")
+										 + fixListForOutput("QMAKE_LIBDIR_FLAGS")
+										 + fixListForOutput("QMAKE_FRAMEWORKPATH_FLAGS")
+										 + fixListForOutput("QMAKE_LIBS"),
+										 SettingsAsList, 6) << ";" << "\n";
+	}
+	if(!project->isEmpty("DESTDIR")) {
+		QString dir = project->first("DESTDIR");
+		if (QDir::isRelativePath(dir))
+			dir.prepend(qmake_getpwd() + Option::dir_sep);
+		t << "\t\t\t\t" << writeSettings("INSTALL_DIR", dir) << ";" << "\n";
+	}
+	if (project->first("TEMPLATE") == "lib") {
+		t << "\t\t\t\t" << writeSettings("INSTALL_PATH", QStringList()) << ";" << "\n";
+	}
+	if(!project->isEmpty("VERSION") && project->first("VERSION") != "0.0.0") {
+		t << "\t\t\t\t" << writeSettings("DYLIB_CURRENT_VERSION",  project->first("VER_MAJ")+"."+project->first("VER_MIN")+"."+project->first("VER_PAT")) << ";" << "\n";
+		if(project->isEmpty("COMPAT_VERSION"))
+			t << "\t\t\t\t" << writeSettings("DYLIB_COMPATIBILITY_VERSION", project->first("VER_MAJ")+"."+project->first("VER_MIN")) << ";" << "\n";
+		if(project->first("TEMPLATE") == "lib" && !project->isActiveConfig("staticlib") &&
+		   project->isActiveConfig("lib_bundle"))
+			t << "\t\t\t\t" << writeSettings("FRAMEWORK_VERSION", project->first("QMAKE_FRAMEWORK_VERSION")) << ";" << "\n";
+	}
+	if(!project->isEmpty("COMPAT_FRAMEWORKPATH"))
+		t << "\t\t\t\t" << writeSettings("FRAMEWORK_SEARCH_PATHS", fixListForOutput("QMAKE_FRAMEWORKPATH"), SettingsAsList, 5) << ";" << "\n";
+	if(!project->isEmpty("COMPAT_VERSION"))
+		t << "\t\t\t\t" << writeSettings("DYLIB_COMPATIBILITY_VERSION", project->first("COMPAT_VERSION")) << ";" << "\n";
+	if(!project->isEmpty("QMAKE_MACOSX_DEPLOYMENT_TARGET"))
+		t << "\t\t\t\t" << writeSettings("MACOSX_DEPLOYMENT_TARGET", project->first("QMAKE_MACOSX_DEPLOYMENT_TARGET")) << ";" << "\n";
+	if(!project->isEmpty("OBJECTS_DIR"))
+		t << "\t\t\t\t" << writeSettings("OBJROOT", fixForOutput(project->first("OBJECTS_DIR"))) << ";" << "\n";
+#if 0
+	if(!project->isEmpty("DESTDIR"))
+		t << "\t\t\t\t" << writeSettings("SYMROOT", fixForOutput(project->first("DESTDIR"))) << ";" << "\n";
+	else
+		t << "\t\t\t\t" << writeSettings("SYMROOT", fixForOutput(qmake_getpwd())) << ";" << "\n";
+#endif
+	{
+		QStringList archs;
+		if(project->isActiveConfig("x86"))
+			archs += "i386";
+		if(project->isActiveConfig("ppc")) {
+			if(!archs.isEmpty())
+				archs += " ";
+			archs += "ppc";
+		}
+		if(project->isActiveConfig("ppc64")) {
+			if(!archs.isEmpty())
+				archs += " ";
+			archs += "ppc64";
+		}
+		if(project->isActiveConfig("x86_64")) {
+			if(!archs.isEmpty())
+				archs += " ";
+			archs += "x86_64";
+		}
+		if(!archs.isEmpty())
+			t << "\t\t\t\t" << writeSettings("ARCHS", archs) << ";" << "\n";
+
+	}
+	if(project->first("TEMPLATE") == "app") {
+		t << "\t\t\t\t" << writeSettings("PRODUCT_NAME", fixForOutput(project->first("QMAKE_ORIG_TARGET"))) << ";" << "\n";
+	} else {
+		if(!project->isActiveConfig("plugin") && project->isActiveConfig("staticlib")) {
+			t << "\t\t\t\t" << writeSettings("LIBRARY_STYLE", "STATIC") << ";" << "\n";
+		} else {
+			t << "\t\t\t\t" << writeSettings("LIBRARY_STYLE", "DYNAMIC") << ";" << "\n";
+		}
+		QString lib = project->first("QMAKE_ORIG_TARGET");
+		if(!project->isActiveConfig("lib_bundle") && !project->isActiveConfig("staticlib"))
+			lib.prepend("lib");
+		t << "\t\t\t\t" << writeSettings("PRODUCT_NAME", escapeFilePath(lib)) << ";" << "\n";
+	}
+	QStringList tmp = project->values("QMAKE_PBX_VARS");
+	for(int i = 0; i < tmp.count(); i++) {
+		QString var = tmp[i], val = qgetenv(var.toLatin1());
+		if(val.isEmpty() && var == "TB")
+			val = "/usr/bin/";
+		t << "\t\t\t\t" << writeSettings(var, escapeFilePath(val)) << ";" << "\n";
+	}
+	t << "\t\t\t" << "};" << "\n";
+}
+
 QString
 ProjectBuilderMakefileGenerator::findProgram(const QString &prog)
 {
@@ -1690,7 +1727,9 @@
 #ifdef Q_OS_DARWIN
             ret = QLatin1String("34");
             QCFType<CFURLRef> cfurl;
-            OSStatus err = LSFindApplicationForInfo(0, CFSTR("com.apple.Xcode"), 0, 0, &cfurl);
+            OSStatus err = LSFindApplicationForInfo(0, CFSTR("com.apple.dt.Xcode"), 0, 0, &cfurl);
+            if ( err != noErr )
+                err = LSFindApplicationForInfo(0, CFSTR("com.apple.Xcode"), 0, 0, &cfurl);
             if (err == noErr) {
                 QCFType<CFBundleRef> bundle = CFBundleCreate(0, cfurl);
                 if (bundle) {
@@ -1700,7 +1739,9 @@
                         QStringList versions = QCFString::toQString(str).split(QLatin1Char('.'));
                         int versionMajor = versions.at(0).toInt();
                         int versionMinor = versions.at(1).toInt();
-                        if (versionMajor >= 2) {
+                        if (versionMajor >= 4) {
+                            ret = QLatin1String("46");
+                        } else if (versionMajor >= 2) {
                             ret = QLatin1String("42");
                         } else if (versionMajor == 1 && versionMinor >= 5) {
                             ret = QLatin1String("39");
diff -Naur qt-no-xcode4/qmake/generators/mac/pbuilder_pbx.h qt-everywhere-opensource-src-4.7.3/qmake/generators/mac/pbuilder_pbx.h
--- qt-no-xcode4/qmake/generators/mac/pbuilder_pbx.h	2011-03-30 16:15:42.000000000 +1100
+++ qt-everywhere-opensource-src-4.7.3/qmake/generators/mac/pbuilder_pbx.h	2011-05-19 11:07:04.000000000 +1000
@@ -78,6 +78,7 @@
     virtual QString escapeFilePath(const QString &path) const;
     bool doPrecompiledHeaders() const { return false; }
     virtual bool doDepends() const { return false; } //never necesary
+	void writeTargetBuildSettings(int pbVersion, QTextStream &t);
 };
 
 inline ProjectBuilderMakefileGenerator::~ProjectBuilderMakefileGenerator()