Merge patch from Pascal Bach

src/image/image.pro

@@ -44,6 +44,11 @@ unix {
     INSTALLS += manins
 }
 
+macx {
+    CONFIG -= app_bundle
+    CONFIG += x86
+}
+
 INSTALLS += target
 target.path=$$INSTALLBASE/bin
 

src/pdf/pdf.pro

@@ -44,6 +44,11 @@ unix {
     INSTALLS += manins
 }
 
+macx {
+    CONFIG -= app_bundle
+    CONFIG += x86
+}
+
 INSTALLS += target
 target.path=$$INSTALLBASE/bin
 

src/shared/commondocparts.cc

@@ -60,7 +60,7 @@ void CommandLineParserBase::outputAuthors(Outputter * o) const {
 	o->paragraph(
 		QString::fromUtf8(
 			"Written by Jan Habermann, Christian Sciberras and Jakob Truelsen. "
-			"Patches by Mehdi Abbad, Lyes Amazouz, Emmanuel Bouthenot, Benoit Garret and Mário Silva."));
+			"Patches by Mehdi Abbad, Lyes Amazouz, Pascal Bach, Emmanuel Bouthenot, Benoit Garret and Mário Silva."));
 	o->endSection();
 }
 

static_qt_conf_osx

@@ -33,4 +33,13 @@
 -no-opengl
 -no-xsync
 -no-javascript-jit
-#-no-egl
+-no-egl
+# Use the carbon version as cocoa doesn't support static build
+-carbon
+# Use the Snow Leopard SDK
+-sdk /Developer/SDKs/MacOSX10.6.sdk
+# Use the Leopard SDK
+# -sdk /Developer/SDKs/MacOSX10.5.sdk
+-arch x86 
+-no-dwarf2 
+-no-framework