1 files changed, 8 insertions, 4 deletions

diff --git a/mkspecs/qws/qnx6-generic-cc/qmake.conf b/mkspecs/qws/qnx6-generic-cc/qmake.conf
index 51eb3fe..55535fd 100644
--- a/mkspecs/qws/qnx6-generic-cc/qmake.conf
+++ b/mkspecs/qws/qnx6-generic-cc/qmake.conf
@@ -1,21 +1,21 @@
 #
 # $Id$
 #
 # qmake configuration for qnx-rtp-gcc
 #
  
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt link_prl
  
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  =
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = -Bstatic -fPIC -pipe -fno-inline -fno-pack-struct -fhonor-std -fno-builtins -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_WARN_ON= -Wall
         QMAKE_CFLAGS_WARN_OFF= -w
         QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB= 
@@ -31,47 +31,51 @@ QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
         QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
         QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
         QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
  
         QMAKE_INCDIR    = /usr/local/include /usr/include/graphics
         QMAKE_LIBDIR    = /usr/local/lib $(QTDIR)/lib
         QMAKE_INCDIR_X11= $(CVSDIR)/hardware/devg/public/graphics/
         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      = cc
         QMAKE_LINK_SHLIB= cc
-        QMAKE_LFLAGS    = -lsocket -ldisputil  $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS    = -lsocket -ldisputil $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
         QMAKE_LFLAGS_SHLIB= -shared
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME= -Wl,-soname,
         QMAKE_LFLAGS_THREAD=
         QMAKE_RPATH     = -Wl,-rpath,
  
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = -lsocket -lcpp $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD=
         QMAKE_LIBS_X11  = -ldisputil -lm
         QMAKE_LIBS_X11SM=
         QMAKE_LIBS_QT   = -lqte 
         QMAKE_LIBS_QT_THREAD= -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
+        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
         QMAKE_LIBS_THREAD= -lpthread
  
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
  
         QMAKE_AR        = ar cqs
         QMAKE_RANLIB    =
  
         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