1 files changed, 6 insertions, 8 deletions

diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf
index 99acca7..7bc67c7 100644
--- a/mkspecs/qws/macx-generic-g++/qmake.conf
+++ b/mkspecs/qws/macx-generic-g++/qmake.conf
@@ -3,13 +3,13 @@
 #
 # qmake configuration for macx-g++ with Qt/Embedded
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt link_prl
+        CONFIG          += qt warn_on release
         QMAKE_EXTENSION_SHLIB= dylib
 
         QMAKE_CC        = $(TB)cc
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  =
         QMAKE_YACC      = yacc
@@ -21,14 +21,13 @@ QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-defaul
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB= -fPIC
         QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
         QMAKE_CFLAGS_THREAD= -D_REENTRANT
 
         QMAKE_CXX       = $(TB)c++
-        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
-DEFINES                += QWS
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) -DQ_OS_MACX -DQT_NO_SOUND -DOPIE_NO_OVERRIDE_QT -DOPIE_NO_BACKTRACE
         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
@@ -39,14 +38,12 @@ QMAKE_LIBDIR		= /sw/lib
         QMAKE_INCDIR_X11=
         QMAKE_LIBDIR_X11=
         QMAKE_INCDIR_QT         = $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
         QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
-        QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
-        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
 
         QMAKE_LINK      = $$QMAKE_CXX
         QMAKE_LINK_SHLIB= $$QMAKE_CXX
         QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
@@ -58,15 +55,15 @@ QMAKE_LFLAGS_THREAD	=
         QMAKE_RPATH     = 
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
         QMAKE_LIBS_X11  =
         QMAKE_LIBS_X11SM=
         QMAKE_LIBS_QT   = -lqte
+        #QMAKE_LIBS_QT  = libqte.dylib
         QMAKE_LIBS_QT_THREAD= -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
-        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
         QMAKE_LIBS_THREAD= 
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
 
         QMAKE_AR        = ar cqs
@@ -76,8 +73,9 @@ QMAKE_TAR		= tar -cf
         QMAKE_GZIP      = gzip -9f
 
         QMAKE_COPY      = cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
-        QMAKE_CHK_DIR_EXISTS= test -d
-        QMAKE_MKDIR     = mkdir -p
+
+
+