2 files changed, 12 insertions, 8 deletions

diff --git a/mkspecs/macx-pbuilder/Info.plist.app b/mkspecs/macx-pbuilder/Info.plist.app
index 9d6c42a..4da07e9 100755
--- a/mkspecs/macx-pbuilder/Info.plist.app
+++ b/mkspecs/macx-pbuilder/Info.plist.app
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
 <plist version="0.9">
 <dict>
         <key>CFBundleIconFile</key>
-        <string>application.icns</string>
+        <string>@ICON@</string>
         <key>CFBundlePackageType</key>
         <string>APPL</string>
         <key>CFBundleGetInfoString</key>
         <string>Created by Qt/QMake</string>
         <key>CFBundleSignature</key>
         <string>ttxt</string>
+        <key>CFBundleExecutable</key>
+        <string>@EXECUTABLE@</string>
         <key>NOTE</key>
         <string>Please, do NOT change this file -- It was generated by Qt/QMake.</string>
 </dict>
 </plist>
diff --git a/mkspecs/macx-pbuilder/qmake.conf b/mkspecs/macx-pbuilder/qmake.conf
index 6d765a8..da820ac 100755
--- a/mkspecs/macx-pbuilder/qmake.conf
+++ b/mkspecs/macx-pbuilder/qmake.conf
@@ -1,79 +1,81 @@
 #
 # $Id$
 #
 # qmake configuration for macx-pbuilder (Mac OS X + Project Builder)
 #
 
         MAKEFILE_GENERATOR= PROJECTBUILDER
         TEMPLATE        = app
-        CONFIG          += qt warn_on release lib_version_first incremental resource_fork plugin_no_soname
+        CONFIG          += qt warn_on release lib_version_first incremental plugin_no_soname link_prl
 
-        QMAKE_CC        = cc
+        QMAKE_CC        = 
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_RESOURCE  = /Developer/Tools/Rez
         QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_DEPS= -M
         QMAKE_CFLAGS_WARN_ON= -Wall -W
         QMAKE_CFLAGS_WARN_OFF=
-        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3)
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Os)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB= -fPIC
         QMAKE_EXTENSION_SHLIB= dylib
         QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
 
-        QMAKE_CXX       = c++
+        QMAKE_CXX       = 
         QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
         QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
         QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
         QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
         QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
         QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
 
         QMAKE_INCDIR    = /usr/local/include \
         /System/Library/Frameworks/CarbonCore.framework/Headers 
         QMAKE_LIBDIR    = 
         QMAKE_INCDIR_QT         = $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /System/Library/Frameworks/OpenGL.framework/Headers \
         /System/Library/Frameworks/AGL.framework/Headers/
 
         QMAKE_LINK      = c++
         QMAKE_LINK_SHLIB= c++
         QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
-        QMAKE_LFLAGS_SHAPP= -prebind
+        QMAKE_LFLAGS_APP= -prebind
         QMAKE_LFLAGS_SHLIB= -dynamiclib
 QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace
-        QMAKE_LFLAGS_PLUGIN= -bundle
-        QMAKE_LFLAGS_SONAME= -install_name$${LITERAL_WHITESPACE}@executable_path/../Frameworks/
+        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
+        #QMAKE_LFLAGS_SONAME= -install_name$${LITERAL_WHITESPACE}@executable_path/../Frameworks/
         QMAKE_LFLAGS_THREAD=
         QMAKE_RPATH     =
 
         QMAKE_LIBS_DYNLOAD=
         QMAKE_LIBS_QT   = -lqt
         QMAKE_LIBS_QT_THREAD= -lqt-mt
         QMAKE_LIBS_THREAD=
         QMAKE_LIBS_OPENGL= -framework OpenGL -framework AGL
         QMAKE_LIBS_OPENGL_QT= $$QMAKE_LIBS_OPENGL
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
 
         QMAKE_AR        = ar cq
         QMAKE_RANLIB    = ranlib -s
 
         QMAKE_TAR       = tar -cf
         QMAKE_GZIP      = gzip -9f
 
         QMAKE_COPY      = cp -f
         QMAKE_COPY_FILE         = $$QMAKE_COPY
         QMAKE_COPY_DIR  = $$QMAKE_COPY -r
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p