allow a means of overriding CFLAGS_RELEASE, as a means of passing in optimizations

61 files changed, 61 insertions, 61 deletions

diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf
index 5eb2f5e..2dee750 100644
--- a/mkspecs/aix-g++/qmake.conf
+++ b/mkspecs/aix-g++/qmake.conf
@@ -1,78 +1,78 @@
 #
 # $Id$
 #
 # qmake configuration for aix-g++
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	=
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_THREAD_SAFE
 
 QMAKE_CXX		= g++
 QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	=
 QMAKE_LFLAGS_THREAD	= -L/usr/lib/threads
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm -lbind
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	= -lpthreads
 
 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
diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf
index bdbec01..49b47a7 100644
--- a/mkspecs/aix-xlc-64/qmake.conf
+++ b/mkspecs/aix-xlc-64/qmake.conf
@@ -1,85 +1,85 @@
 #
 # $Id$
 #
 # qmake configuration for aix-xlc
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= xlc
 QMAKE_CC_THREAD		= xlc_r
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -qstrict -q64 $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -qwarn64
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O3
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	=
 QMAKE_CFLAGS_YACC	=
 QMAKE_CFLAGS_THREAD	= -qthreaded -D_THREAD_SAFE
 
 QMAKE_CXX		= xlC
 QMAKE_CXX_THREAD	= xlC_r
 QMAKE_CXXFLAGS		= -+ $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
 QMAKE_LINK		= xlC
 QMAKE_LINK_THREAD	= xlC_r
 QMAKE_LINK_SHLIB	= ld
 QMAKE_LINK_SHLIB_CMD	= makeC++SharedLib -p 0 -X64 \
 			    -o $(TARGETD) \
 			    $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \
 			  $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \
 			  $(RANLIB) lib$(QMAKE_TARGET).a; \
 			  mv lib$(QMAKE_TARGET).a $(DESTDIR)
 QMAKE_LFLAGS		= -q64 $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	=
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	=
 QMAKE_LFLAGS_THREAD	= -L/usr/lib/threads
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm -lbind
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	= -lpthreads
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar -X64 cq
 QMAKE_RANLIB		= ranlib -X64
 
 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
diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf
index c74459d..6e17b4a 100644
--- a/mkspecs/aix-xlc/qmake.conf
+++ b/mkspecs/aix-xlc/qmake.conf
@@ -1,85 +1,85 @@
 #
 # $Id$
 #
 # qmake configuration for aix-xlc
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= xlc
 QMAKE_CC_THREAD		= xlc_r
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -qstrict $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O3
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	=
 QMAKE_CFLAGS_YACC	=
 QMAKE_CFLAGS_THREAD	= -qthreaded -D_THREAD_SAFE
 
 QMAKE_CXX		= xlC
 QMAKE_CXX_THREAD	= xlC_r
 QMAKE_CXXFLAGS		= -+ $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
 QMAKE_LINK		= xlC
 QMAKE_LINK_THREAD	= xlC_r
 QMAKE_LINK_SHLIB	= ld
 QMAKE_LINK_SHLIB_CMD	= makeC++SharedLib -p 0 \
 			    -o $(TARGETD) \
 			    $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \
 			  ar q lib$(QMAKE_TARGET).a $(TARGETD); \
 			  ranlib lib$(QMAKE_TARGET).a; \
 			  mv lib$(QMAKE_TARGET).a $(DESTDIR)
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	=
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	=
 QMAKE_LFLAGS_THREAD	= -L/usr/lib/threads
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm -lbind
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	= -lpthreads
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar cq
 QMAKE_RANLIB		= 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
diff --git a/mkspecs/bsdi-g++/qmake.conf b/mkspecs/bsdi-g++/qmake.conf
index 4b48706..628c09b 100644
--- a/mkspecs/bsdi-g++/qmake.conf
+++ b/mkspecs/bsdi-g++/qmake.conf
@@ -1,82 +1,82 @@
 #
 # $Id$
 #
 # qmake configuration for bsdi-g++
 #
 # Written for WindRiver BSD/OS 4.0.
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	=
 
 QMAKE_CXX		= g++
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(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		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	=
 
 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
diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf
index 9147bed..50aba89 100644
--- a/mkspecs/cygwin-g++/qmake.conf
+++ b/mkspecs/cygwin-g++/qmake.conf
@@ -1,80 +1,80 @@
 #
 # $Id$
 #
 # qmake configuration for cygwin-g++
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release incremental
 QMAKE_INCREMENTAL_STYLE  = sublib
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	=
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= g++
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(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		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 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
diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf
index 9d057ea..2051427 100644
--- a/mkspecs/darwin-g++/qmake.conf
+++ b/mkspecs/darwin-g++/qmake.conf
@@ -1,80 +1,80 @@
 #
 # $Id$
 #
 # qmake configuration for darwin-g++ (Darwin/X11)
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release resource_fork
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O3
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_EXTENSION_SHLIB	= dylib
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	=
 
 QMAKE_CXX		= c++
 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_CXXFLAGS_THREAD	=
 
 QMAKE_INCDIR		= /usr/local/include
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= c++
 QMAKE_LINK_SHLIB	= c++
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -dynamiclib
 QMAKE_LFLAGS_PLUGIN	= -bundle
 QMAKE_LFLAGS_THREAD	= 
 QMAKE_RPATH		= 
 
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	=
 
 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
diff --git a/mkspecs/dgux-g++/qmake.conf b/mkspecs/dgux-g++/qmake.conf
index 4de5c77..04af167 100644
--- a/mkspecs/dgux-g++/qmake.conf
+++ b/mkspecs/dgux-g++/qmake.conf
@@ -1,75 +1,75 @@
 #
 # $Id$
 #
 # qmake configuration for dgux-g++
 #
 # Written for DG/UX R4.20MU06.
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 
 QMAKE_CXX		= g++
 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		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-h,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_QT		= -lqt
 
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar cq
 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
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf
index 33c401e..020d6d5 100644
--- a/mkspecs/freebsd-g++/qmake.conf
+++ b/mkspecs/freebsd-g++/qmake.conf
@@ -1,80 +1,80 @@
 #
 # $Id$
 #
 # qmake configuration for freebsd-g++
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -pthread -D_THREAD_SAFE
 
 QMAKE_CXX		= g++
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 # Addon software goes into /usr/local on the BSDs, by default we will look there
 QMAKE_INCDIR		= /usr/local/include
 QMAKE_LIBDIR		= /usr/local/lib
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(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	= -pthread
 QMAKE_RPATH		= -Wl,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	=
 
 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
diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf
index 73e6093..7affcb4 100644
--- a/mkspecs/hpux-acc-64/qmake.conf
+++ b/mkspecs/hpux-acc-64/qmake.conf
@@ -1,121 +1,121 @@
 #
 # $Id$
 #
 # qmake configuration for hpux-n64
 #
 # We define _POSIX_C_SOURCE to 199506L when using threads, therefore
 # we also need to redefine _HPUX_SOURCE.
 # From pthread(3t):
 # 	Some documentation will recommend the use of -D_REENTRANT for
 # 	compilation.  While this also functions properly, it is considered
 # 	an obsolescent form.
 # See pthread(3t) for more details.
 #
 # From the "HP aC++ Online Programmer's Guide":
 # 	When +DA2.0W is specified:
 # 	* 64-bit SVR4 Executable and Linking Format (ELF) object files
 # 	  are generated for PA-RISC 2.0. 
 # 	* The preprocessor predefined macro, __LP64__ is defined. 
 # 	* The correct path for 64-bit system and language libraries is
 # 	  selected.
 # 	When +DD32 is specified:
 # 	* The size of an int, long, or pointer data type is 32-bits. 
 # 	  The size of an int data type is 32-bits. The size of a long or
 # 	  pointer data type is 64-bits.
 # 	* This is the default, currently equivalent to +DA1.1 architecture.
 # 	When +DD64 is specified:
 # 	* The size of an int data type is 32-bits. The size of a long or
 # 	  pointer data type is 64-bits.
 # 	* This is currently equivalent to +DA2.OW architecture.
 # 	* The preprocessor predefined macro, __LP64__ is defined.
 # 	Using +DS to Specify Instruction Scheduling:
 # 	* By default, the compiler performs scheduling tuned for the system
 # 	  on which you are compiling, or, if specified, tuned for the setting
 # 	  of the +DA option.
 #
 # From the online "C/HP-UX Reference Manual":
 #	-Aa
 # 	  Enables strict ANSI C compliance.
 # 	-Ae
 # 	  Enables ANSI C compliance, HP value-added features (as described
 # 	  for +e option), and _HPUX_SOURCE name space macro. It is equivalent
 # 	  to -Aa +e -D_HPUX_SOURCE.
 # 	+e
 # 	  Enables the following HP value added features while compiling in
 # 	  ANSI C mode: sized enum, long long, long pointers, compiler supplied
 # 	  defaults for missing arguments to intrinsic calls, and $ in identifier
 # 	  HP C extensions.
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -Ae +DA2.0W -w $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O +Osize
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O +Osize)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= +Z
 QMAKE_CFLAGS_YACC	=
 QMAKE_CFLAGS_THREAD	= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
 
 QMAKE_CXX		= aCC
 QMAKE_CXXFLAGS		= -Aa +DA2.0W -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA)
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/include/X11R6
 QMAKE_LIBDIR_X11	= /usr/lib/X11R6/pa20_64
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64
 
 QMAKE_LINK		= aCC
 QMAKE_LINK_SHLIB	= aCC
 QMAKE_LFLAGS		= +DA2.0W -Wl,+s $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	= -O
 QMAKE_LFLAGS_DEBUG	= -Wl,+tools -g
 QMAKE_LFLAGS_SHLIB	= -b
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,+h,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -Wl,+b,
 
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	= -ldld
 QMAKE_LIBS_X11		= -lXext -lX11
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXm
 QMAKE_LIBS_THREAD	= -lpthread
 QMAKE_LIBS_YACC		= -ly
 
 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
diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf
index d7b01b7..f47f74b 100644
--- a/mkspecs/hpux-acc-o64/qmake.conf
+++ b/mkspecs/hpux-acc-o64/qmake.conf
@@ -1,121 +1,121 @@
 #
 # $Id$
 #
 # qmake configuration for hpux-o64
 #
 # We define _POSIX_C_SOURCE to 199506L when using threads, therefore
 # we also need to redefine _HPUX_SOURCE.
 # From pthread(3t):
 # 	Some documentation will recommend the use of -D_REENTRANT for
 # 	compilation.  While this also functions properly, it is considered
 # 	an obsolescent form.
 # See pthread(3t) for more details.
 #
 # From the "HP aC++ Online Programmer's Guide":
 # 	When +DA2.0W is specified:
 # 	* 64-bit SVR4 Executable and Linking Format (ELF) object files
 # 	  are generated for PA-RISC 2.0. 
 # 	* The preprocessor predefined macro, __LP64__ is defined. 
 # 	* The correct path for 64-bit system and language libraries is
 # 	  selected.
 # 	When +DD32 is specified:
 # 	* The size of an int, long, or pointer data type is 32-bits. 
 # 	  The size of an int data type is 32-bits. The size of a long or
 # 	  pointer data type is 64-bits.
 # 	* This is the default, currently equivalent to +DA1.1 architecture.
 # 	When +DD64 is specified:
 # 	* The size of an int data type is 32-bits. The size of a long or
 # 	  pointer data type is 64-bits.
 # 	* This is currently equivalent to +DA2.OW architecture.
 # 	* The preprocessor predefined macro, __LP64__ is defined.
 # 	Using +DS to Specify Instruction Scheduling:
 # 	* By default, the compiler performs scheduling tuned for the system
 # 	  on which you are compiling, or, if specified, tuned for the setting
 # 	  of the +DA option.
 #
 # From the online "C/HP-UX Reference Manual":
 #	-Aa
 # 	  Enables strict ANSI C compliance.
 # 	-Ae
 # 	  Enables ANSI C compliance, HP value-added features (as described
 # 	  for +e option), and _HPUX_SOURCE name space macro. It is equivalent
 # 	  to -Aa +e -D_HPUX_SOURCE.
 # 	+e
 # 	  Enables the following HP value added features while compiling in
 # 	  ANSI C mode: sized enum, long long, long pointers, compiler supplied
 # 	  defaults for missing arguments to intrinsic calls, and $ in identifier
 # 	  HP C extensions.
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -Ae +DA2.0 -w $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O +Oentrysched +Onolimit
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O +Oentrysched +Onolimit)
 QMAKE_CFLAGS_DEBUG	= -y -g
 QMAKE_CFLAGS_SHLIB	= +Z
 QMAKE_CFLAGS_YACC	=
 QMAKE_CFLAGS_THREAD	= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
 
 QMAKE_CXX		= aCC
 QMAKE_CXXFLAGS		= +DA2.0 -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA)
 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	= -g
 QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
 QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/include/X11R6
 QMAKE_LIBDIR_X11	= /usr/lib/X11R6
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
 
 QMAKE_LINK		= aCC
 QMAKE_LINK_SHLIB	= aCC
 QMAKE_LFLAGS		= +DA2.0 -Wl,+s $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	= -O
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -b
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,+h,
 QMAKE_RPATH		= -Wl,+b,
 
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	= -ldld
 QMAKE_LIBS_X11		= -lXext -lX11
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	= -lpthread
 QMAKE_LIBS_YACC		= -ly
 
 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
diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf
index 5990aa7..26eca39 100644
--- a/mkspecs/hpux-acc/qmake.conf
+++ b/mkspecs/hpux-acc/qmake.conf
@@ -1,100 +1,100 @@
 #
 # $Id$
 #
 # qmake configuration for hpux-acc
 #
 # We define _POSIX_C_SOURCE to 199506L when using threads, therefore
 # we also need to redefine _HPUX_SOURCE. See pthread(3t) for more details.
 #
 # From the "HP aC++ Online Programmer's Guide":
 # 	Using +DS to Specify Instruction Scheduling:
 # 	* By default, the compiler performs scheduling tuned for the system
 # 	  on which you are compiling, or, if specified, tuned for the setting
 # 	  of the +DA option.
 #
 # From the online "C/HP-UX Reference Manual":
 #	-Aa
 # 	  Enables strict ANSI C compliance.
 # 	-Ae
 # 	  Enables ANSI C compliance, HP value-added features (as described
 # 	  for +e option), and _HPUX_SOURCE name space macro. It is equivalent
 # 	  to -Aa +e -D_HPUX_SOURCE.
 # 	+e
 # 	  Enables the following HP value added features while compiling in
 # 	  ANSI C mode: sized enum, long long, long pointers, compiler supplied
 # 	  defaults for missing arguments to intrinsic calls, and $ in identifier
 # 	  HP C extensions.
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			= qt warn_on release
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -Ae +DAportable -w +Z $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= 
 QMAKE_CFLAGS_YACC	=
 QMAKE_CFLAGS_THREAD	= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
 
 QMAKE_CXX		= aCC
 QMAKE_CXXFLAGS		= +DAportable -w +Z -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA)
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/include/X11R6
 QMAKE_LIBDIR_X11	= /usr/lib/X11R6
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
 
 QMAKE_LINK		= aCC
 QMAKE_LINK_SHLIB	= aCC
 QMAKE_LFLAGS		= +DAportable -Wl,+s $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	= -O
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -b -Wl,-a,shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,+h,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -Wl,+b,
 
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	= -ldld
 QMAKE_LIBS_X11		= -lXext -lX11
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXm
 QMAKE_LIBS_THREAD	= -lpthread
 QMAKE_LIBS_YACC		= -ly
 
 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
diff --git a/mkspecs/hpux-cc/qmake.conf b/mkspecs/hpux-cc/qmake.conf
index 56e9057..d522252 100644
--- a/mkspecs/hpux-cc/qmake.conf
+++ b/mkspecs/hpux-cc/qmake.conf
@@ -1,97 +1,97 @@
 #
 # $Id$
 #
 # qmake configuration for hpux-cc
 #
 # We define _POSIX_C_SOURCE to 199506L when using threads, therefore
 # we also need to redefine _HPUX_SOURCE.
 # See pthread(3t) for more details.
 #
 # From the "HP aC++ Online Programmer's Guide":
 # 	Using +DS to Specify Instruction Scheduling:
 # 	* By default, the compiler performs scheduling tuned for the system
 # 	  on which you are compiling, or, if specified, tuned for the setting
 # 	  of the +DA option.
 #
 # From the online "C/HP-UX Reference Manual":
 #	-Aa
 # 	  Enables strict ANSI C compliance.
 # 	-Ae
 # 	  Enables ANSI C compliance, HP value-added features (as described
 # 	  for +e option), and _HPUX_SOURCE name space macro. It is equivalent
 # 	  to -Aa +e -D_HPUX_SOURCE.
 # 	+e
 # 	  Enables the following HP value added features while compiling in
 # 	  ANSI C mode: sized enum, long long, long pointers, compiler supplied
 # 	  defaults for missing arguments to intrinsic calls, and $ in identifier
 # 	  HP C extensions.
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -Ae +DA1.1e -w $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= +Z
 QMAKE_CFLAGS_YACC	=
 
 QMAKE_CXX		= CC
 QMAKE_CXXFLAGS		= +DA1.1e -w +a1 $(CXXFLAGS_EXTRA)
 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		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/include/X11R6
 QMAKE_LIBDIR_X11	= /usr/lib/X11R6
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
 
 QMAKE_LINK		= CC
 QMAKE_LINK_SHLIB	= CC
 # CC generates template code during linking, and so needs -I's
 QMAKE_LFLAGS		= +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_QT $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	= -O -s
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -b
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,+h,
 QMAKE_RPATH		= -Wl,+b,
 
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	= -ldld
 QMAKE_LIBS_X11		= -lXext -lX11
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 
 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
diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf
index 9ba5359..b11fde2 100644
--- a/mkspecs/hpux-g++/qmake.conf
+++ b/mkspecs/hpux-g++/qmake.conf
@@ -1,83 +1,83 @@
 #
 # $Id$
 #
 # qmake configuration for hpux-g++
 #
 # We define _POSIX_C_SOURCE to 199506L when using threads, therefore
 # we also need to redefine _HPUX_SOURCE.
 # See pthread(3t) for more details.
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
 
 QMAKE_CXX		= g++
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/include/X11R6
 QMAKE_LIBDIR_X11	= /usr/lib/X11R6
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /opt/Mesa/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /opt/Mesa/lib /usr/contrib/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= -Wl,+s $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -fPIC -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,+h,
 QMAKE_RPATH		= -Wl,+b,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldld
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 
 QMAKE_LIBS_OPENGL	=
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 
 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
diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf
index 12d70f7..1898ea2 100644
--- a/mkspecs/hurd-g++/qmake.conf
+++ b/mkspecs/hurd-g++/qmake.conf
@@ -1,77 +1,77 @@
 #
 # $Id$
 #
 # qmake configuration for hurd-g++
 #
 # Submitted by uch@nop.or.jp as "gnu-g++".
 # Renamed to "hurd-g++" because people were confusing gnu with linux.
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 
 QMAKE_CXX		= g++
 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		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= -Wl,-rpath=/lib:/usr/X11R6/lib:$(QTDIR)/lib $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_QT		= -lqt
 
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 
 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
 
diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf
index 0113dac..cd6c432 100644
--- a/mkspecs/irix-cc-64/qmake.conf
+++ b/mkspecs/irix-cc-64/qmake.conf
@@ -1,113 +1,113 @@
 #
 # $Id$
 #
 # qmake configuration for irix-64
 #
 # From cc(1):
 # 	-64
 # 	  Generates a 64-bit object. This defaults to -mips4 if -mips3 has
 # 	  not been specified.
 # 	-LANG: ...
 # 	  The language feature option group controls the source language
 # 	  interpretation assumed by the compiler. The individual controls
 # 	  in this group are as follows:
 # 	    ansi-for-init-scope [ = ( ON|OFF ) ]
 # 	      Enables or disables the ANSI scoping rules for for-init
 # 	      declarations (the scope of the name declared extends to
 # 	      the end of the for statement). This enables the behavior
 # 	      that is required by the C++ standard. The default value
 # 	      is OFF, which is the ARM behavior (the scope of the name
 # 	      declared extends to the end of the block enclosing the for
 # 	      statement).
 # 	    bool [ = ( ON|OFF ) ]
 # 	      Enables or disables the predefined bool data type, along
 # 	      with the predefined values true and false. Use this option
 # 	      only to suppress this type in old code that defines bool
 # 	      itself.  Because this option changes the mangling of function
 # 	      names with bool parameters, all files comprising a program
 # 	      should be compiled with consistent options.
 # 	      Default is ON.
 # 	      The _BOOL feature macro can be used in #ifdefs to do conditional
 # 	      compilation based on whether or not this option is enabled.
 # 	    std
 # 	      Enables use of the standard C++ library and standard-
 # 	      conforming iostream library.  Specifying this flag also
 # 	      triggers other standard-conforming behavior, such as the
 # 	      new rules for the scope of for loop initializers.
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -64 -woff 1021,1209,1233,1314,1355,1375,1506 $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -fullwarn
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O2 -OPT:Olimit=3000
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -OPT:Olimit=3000)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	=
 QMAKE_CFLAGS_YACC	= -woff 1110,1174,3262
 QMAKE_CFLAGS_THREAD	=
 
 QMAKE_CXX		= CC
 QMAKE_CXXFLAGS		= -64 -woff 1021,1209,1233,1314,1355,1375,1506,1681,1682,3496 $(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_CXXFLAGS_THREAD	=
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
 QMAKE_LINK		= CC
 QMAKE_LINK_SHLIB	= CC
 QMAKE_LFLAGS		= -64 $(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		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu -lm
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	= -lpthread
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= CC -ar -o
 QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
 
 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
diff --git a/mkspecs/irix-cc-o32/qmake.conf b/mkspecs/irix-cc-o32/qmake.conf
index f512ec1..b755813 100644
--- a/mkspecs/irix-cc-o32/qmake.conf
+++ b/mkspecs/irix-cc-o32/qmake.conf
@@ -1,87 +1,87 @@
 #
 # $Id$
 #
 # qmake configuration for irix-o32
 #
 # From cc(1):
 # 	-o32 or -32
 # 	  Generates an (old) 32-bit object. See the o32(5) man page for
 # 	  option descriptions and details. This defaults to -mips2 if
 # 	  -mips1 has not been specified.
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS		= -o32 -woff 3203,3260,3672 $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -fullwarn
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O2 -Olimit 3000
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -Olimit 3000)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	=
 QMAKE_CFLAGS_YACC	= -woff 3203,3262
 QMAKE_CFLAGS_THREAD	=
 
 QMAKE_CXX		= CC
 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_CXXFLAGS_THREAD	=
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
 QMAKE_LINK		= CC
 QMAKE_LINK_SHLIB	= CC
 QMAKE_LFLAGS		= -o32 $(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		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu -lm
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	= -lpthread
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar cq
 QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
 
 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
diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf
index 2fef9df..e51731b 100644
--- a/mkspecs/irix-cc/qmake.conf
+++ b/mkspecs/irix-cc/qmake.conf
@@ -1,113 +1,113 @@
 #
 # $Id$
 #
 # qmake configuration for irix-n32
 #
 # From cc(1):
 # 	-n32
 # 	  Generates a (new) 32-bit object. This defaults to -mips3 if
 # 	  -mips4 has not been specified.
 # 	-LANG: ...
 # 	  The language feature option group controls the source language
 # 	  interpretation assumed by the compiler. The individual controls
 # 	  in this group are as follows:
 # 	    ansi-for-init-scope [ = ( ON|OFF ) ]
 # 	      Enables or disables the ANSI scoping rules for for-init
 # 	      declarations (the scope of the name declared extends to
 # 	      the end of the for statement). This enables the behavior
 # 	      that is required by the C++ standard. The default value
 # 	      is OFF, which is the ARM behavior (the scope of the name
 # 	      declared extends to the end of the block enclosing the for
 # 	      statement).
 # 	    bool [ = ( ON|OFF ) ]
 # 	      Enables or disables the predefined bool data type, along
 # 	      with the predefined values true and false. Use this option
 # 	      only to suppress this type in old code that defines bool
 # 	      itself.  Because this option changes the mangling of function
 # 	      names with bool parameters, all files comprising a program
 # 	      should be compiled with consistent options.
 # 	      Default is ON.
 # 	      The _BOOL feature macro can be used in #ifdefs to do conditional
 # 	      compilation based on whether or not this option is enabled.
 # 	    std
 # 	      Enables use of the standard C++ library and standard-
 # 	      conforming iostream library.  Specifying this flag also
 # 	      triggers other standard-conforming behavior, such as the
 # 	      new rules for the scope of for loop initializers.
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -n32 -woff 1021,1209,1233,1314,1355,1375,1506 $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -fullwarn
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O2 -OPT:Olimit=3000
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -OPT:Olimit=3000)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	=
 QMAKE_CFLAGS_YACC	= -woff 1110,1174,3262
 QMAKE_CFLAGS_THREAD	=
 
 QMAKE_CXX		= CC
 QMAKE_CXXFLAGS		= -n32 -woff 1021,1209,1233,1314,1355,1375,1506,1681,1682,3496 $(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_CXXFLAGS_THREAD	=
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
 QMAKE_LINK		= CC
 QMAKE_LINK_SHLIB	= CC
 QMAKE_LFLAGS		= -n32 $(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		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu -lm
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	= -lpthread
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= CC -ar -o
 QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
 
 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
diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf
index 7def26a..38ee5d8 100644
--- a/mkspecs/irix-g++/qmake.conf
+++ b/mkspecs/irix-g++/qmake.conf
@@ -1,84 +1,84 @@
 #
 # $Id$
 #
 # qmake configuration for irix-g++
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	=
 
 QMAKE_CXX		= g++
 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_CXXFLAGS_THREAD	=
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(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		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 # libGLU is using the SGI C++ library internally and this somehow clashes
 # with the GNU C++ library (similar name mangling and symbol names?)
 # so we add -lC so that the SGI C++ library is used first...
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu -lC
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	= -lpthread
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar cq
 QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= so_locations
 
 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
diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
index 28687c3..0f10c6a 100644
--- a/mkspecs/linux-cxx/qmake.conf
+++ b/mkspecs/linux-cxx/qmake.conf
@@ -1,75 +1,75 @@
 #
 # $Id$
 #
 # qmake configuration for Compaq C++ for Linux on Alpha
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= ccc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -w $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	=
 QMAKE_CFLAGS_YACC	= -Olimit 1000
 
 QMAKE_CXX		= cxx
 QMAKE_CXXFLAGS		= -w $(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		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= cxx
 QMAKE_LINK_SHLIB	= cxx
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		= -lnsl
 QMAKE_LIBS_QT		= -lqt
 
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 
 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
diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf
index 4507b37..dcc993a 100644
--- a/mkspecs/linux-g++/qmake.conf
+++ b/mkspecs/linux-g++/qmake.conf
@@ -1,82 +1,82 @@
 #
 # $Id$
 #
 # qmake configuration for linux-g++
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release incremental
 QMAKE_INCREMENTAL_STYLE  = sublib
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= g++
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(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		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		= -lnsl
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 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_STRIP             = strip
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index cd13562..f6b721d 100644
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -1,82 +1,82 @@
 #
 # $Id$
 #
 # qmake configuration for Intel C++ 5.0.1, 6.0, and 7.0 for Linux
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= icc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -KPIC
 QMAKE_CFLAGS_YACC	=
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= icpc
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= icpc
 QMAKE_LINK_SHLIB	= icpc
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Qoption,ld,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -Qoption,ld,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		= -lnsl
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	= -lpthread
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)/ti_files
 
 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
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
index 17bf26a..47ad018 100644
--- a/mkspecs/linux-kcc/qmake.conf
+++ b/mkspecs/linux-kcc/qmake.conf
@@ -1,89 +1,89 @@
 #
 # $Id$
 #
 # qmake configuration for KAI C++ 4.0f for Linux
 #
 # From the KAI C++ man page for Linux:
 # --[no_]thread_safe
 # 	[Waive or] Request thread-safe handling of system-allocated objects.
 # 	To guarantee thread safety, this option must be used when both
 # 	compiling and linking. Thread-safe C++ is not link-compatible with
 # 	(the default) non-thread-safe C++.
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= KCC
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= --c --display_error_number --backend -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= +K2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), +K2)
 QMAKE_CFLAGS_DEBUG	= +K0
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= --diag_suppress 111,177
 QMAKE_CFLAGS_THREAD	= --thread_safe
 
 QMAKE_CXX		= KCC
 QMAKE_CXXFLAGS		= --display_error_number --diag_suppress 611,1142 --backend -pipe $(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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= KCC
 QMAKE_LINK_SHLIB	= KCC
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	=
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= --soname$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	= --thread_safe
 QMAKE_RPATH		= -rpath$$LITERAL_WHITESPACE
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		= -lnsl
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	=
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)ti_files
 
 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
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
index ddccc47..e8161ae 100644
--- a/mkspecs/linux-pgcc/qmake.conf
+++ b/mkspecs/linux-pgcc/qmake.conf
@@ -1,80 +1,80 @@
 #
 # $Id$
 #
 # qmake configuration for Portland Group C++ for Intel
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= pgcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -fast
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -fast)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fpic
 QMAKE_CFLAGS_YACC	=
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= pgCC
 QMAKE_CXXFLAGS		= --display_error_number $$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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= pgCC
 QMAKE_LINK_SHLIB	= pgCC
 QMAKE_LFLAGS		= $(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		= -R
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		= -lnsl
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 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
diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf
index 77c206c..dc8da5c 100644
--- a/mkspecs/macx-g++/qmake.conf
+++ b/mkspecs/macx-g++/qmake.conf
@@ -1,80 +1,80 @@
 #
 # $Id$
 #
 # qmake configuration for macx-g++ (Mac OS X + command-line compiler)
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release resource_fork incremental global_init_link_order lib_version_first plugin_no_soname
 QMAKE_INCREMENTAL_STYLE = sublibs
 
 QMAKE_CC		= $(TB)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	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_EXTENSION_SHLIB	= dylib
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 
 QMAKE_CXX		= $(TB)c++
 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
 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		= $$QMAKE_CXX
 QMAKE_LINK_SHLIB	= $$QMAKE_CXX
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 #QMAKE_LFLAGS_PREBIND    = -prebind -seg1addr 0x90000000
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHAPP	= -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_THREAD	= 
 QMAKE_RPATH		= 
 
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -framework OpenGL -framework AGL
 QMAKE_LIBS_OPENGL_QT	= $$QMAKE_LIBS_OPENGL
 QMAKE_LIBS_THREAD	= 
 
 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
diff --git a/mkspecs/macx-pbuilder/qmake.conf b/mkspecs/macx-pbuilder/qmake.conf
index b576719..6d765a8 100755
--- a/mkspecs/macx-pbuilder/qmake.conf
+++ b/mkspecs/macx-pbuilder/qmake.conf
@@ -1,79 +1,79 @@
 #
 # $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
 
 QMAKE_CC		= 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	= -O3
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_EXTENSION_SHLIB	= dylib
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 
 QMAKE_CXX		= c++
 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_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_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
diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf
index 33264b3..fcabcaf 100644
--- a/mkspecs/netbsd-g++/qmake.conf
+++ b/mkspecs/netbsd-g++/qmake.conf
@@ -1,80 +1,80 @@
 #
 # $Id$
 #
 # qmake configuration for netbsd-g++
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -pthread
 
 QMAKE_CXX		= g++
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		= /usr/local/include
 QMAKE_LIBDIR		= /usr/local/lib
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LINK_SHLIB_CMD    = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
 QMAKE_LFLAGS		= $(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	= -pthread
 QMAKE_RPATH		= -Wl,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	=
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		= 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
diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf
index ea3bda9..9b929b1 100644
--- a/mkspecs/openbsd-g++/qmake.conf
+++ b/mkspecs/openbsd-g++/qmake.conf
@@ -1,81 +1,81 @@
 #
 # $Id$
 #
 # qmake configuration for openbsd-g++
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -pthread
 
 QMAKE_CXX		= g++
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		= /usr/local/include
 QMAKE_LIBDIR		= /usr/local/lib
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LINK_SHLIB_CMD	= $$QMAKE_LINK_SHLIB $(LFLAGS) \
 	$$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \
 	-o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
 QMAKE_LFLAGS		= $(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	= -pthread
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	=
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar q
 QMAKE_RANLIB		= 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
diff --git a/mkspecs/qnx-g++/qmake.conf b/mkspecs/qnx-g++/qmake.conf
index 164dea6..b34eaba 100644
--- a/mkspecs/qnx-g++/qmake.conf
+++ b/mkspecs/qnx-g++/qmake.conf
@@ -1,81 +1,81 @@
 #
 # $Id$
 #
 # qmake configuration for qnx-g++
 #
 # QNX RTOS v6 with X11
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe -fno-inline -fno-pack-struct $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= g++
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(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		= -lunix
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	=
 
 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
diff --git a/mkspecs/qws/freebsd-generic-g++/qmake.conf b/mkspecs/qws/freebsd-generic-g++/qmake.conf
index cb551a8..546166e 100644
--- a/mkspecs/qws/freebsd-generic-g++/qmake.conf
+++ b/mkspecs/qws/freebsd-generic-g++/qmake.conf
@@ -1,71 +1,71 @@
 #
 # $Id$
 #
 # qmake configuration for freebsd-g++ with Qt/Embedded
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2 -fno-default-inline
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -pthread -D_THREAD_SAFE
 
 QMAKE_CXX		= g++
 QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 # Addon software goes into /usr/local on the BSDs, by default we will look there
 QMAKE_INCDIR		= /usr/local/include
 QMAKE_LIBDIR		= /usr/local/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(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     = -pthread
 QMAKE_RPATH             = -Wl,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_QT		= -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
 QMAKE_LIBS_THREAD       = 
 
 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
diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf
index 30c58d3..8eabcb9 100644
--- a/mkspecs/qws/linux-arm-g++/qmake.conf
+++ b/mkspecs/qws/linux-arm-g++/qmake.conf
@@ -1,76 +1,76 @@
 #
 # $Id$
 #
 # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= arm-linux-gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= arm-linux-g++
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 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_LINK		= arm-linux-g++
 QMAKE_LINK_SHLIB	= arm-linux-g++
 QMAKE_LFLAGS		= $(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		= 
 QMAKE_LIBS_DYNLOAD      = -ldl
 QMAKE_LIBS_X11		= 
 QMAKE_LIBS_X11SM	= 
 QMAKE_LIBS_QT		= -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
 QMAKE_LIBS_QT_OPENGL	= -lqgl
 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
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf
index 135c6f9..43f0d7f 100644
--- a/mkspecs/qws/linux-generic-g++/qmake.conf
+++ b/mkspecs/qws/linux-generic-g++/qmake.conf
@@ -1,76 +1,76 @@
 #
 # $Id$
 #
 # qmake configuration for linux-g++
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= g++
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 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_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(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		= 
 QMAKE_LIBS_DYNLOAD      = -ldl
 QMAKE_LIBS_X11		= 
 QMAKE_LIBS_X11SM	= 
 QMAKE_LIBS_QT		= -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
 QMAKE_LIBS_QT_OPENGL	= -lqgl
 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
diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf
index 7e4cbf5..c06e614 100644
--- a/mkspecs/qws/linux-ipaq-g++/qmake.conf
+++ b/mkspecs/qws/linux-ipaq-g++/qmake.conf
@@ -1,76 +1,76 @@
 #
 # $Id$
 #
 # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= arm-linux-gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= arm-linux-g++ -DQT_QWS_IPAQ
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS  -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 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_LINK		= arm-linux-g++
 QMAKE_LINK_SHLIB	= arm-linux-g++
 QMAKE_LFLAGS		= $(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		= 
 QMAKE_LIBS_DYNLOAD      = -ldl
 QMAKE_LIBS_X11		= 
 QMAKE_LIBS_X11SM	= 
 QMAKE_LIBS_QT		= -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
 QMAKE_LIBS_QT_OPENGL	= -lqgl
 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
diff --git a/mkspecs/qws/linux-mips-g++/qmake.conf b/mkspecs/qws/linux-mips-g++/qmake.conf
index 55547dd..a34b651 100644
--- a/mkspecs/qws/linux-mips-g++/qmake.conf
+++ b/mkspecs/qws/linux-mips-g++/qmake.conf
@@ -1,76 +1,76 @@
 #
 # $Id$
 #
 # qmake configuration for linux-g++ using the mipsel-linux-g++ crosscompiler
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= mipsel-linux-gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= mipsel-linux-g++
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 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_LINK		= mipsel-linux-g++
 QMAKE_LINK_SHLIB	= mipsel-linux-g++
 QMAKE_LFLAGS		= $(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		= 
 QMAKE_LIBS_DYNLOAD      = -ldl
 QMAKE_LIBS_X11		= 
 QMAKE_LIBS_X11SM	= 
 QMAKE_LIBS_QT		= -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
 QMAKE_LIBS_QT_OPENGL	= -lqgl
 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
diff --git a/mkspecs/qws/linux-sharp-g++/qmake.conf b/mkspecs/qws/linux-sharp-g++/qmake.conf
index 11405c4..0c7ee7f 100644
--- a/mkspecs/qws/linux-sharp-g++/qmake.conf
+++ b/mkspecs/qws/linux-sharp-g++/qmake.conf
@@ -1,76 +1,76 @@
 #
 # $Id$
 #
 # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= arm-linux-gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= arm-linux-g++ -DQT_QWS_SHARP -DQT_QWS_EBX
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS  -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 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_LINK		= arm-linux-g++
 QMAKE_LINK_SHLIB	= arm-linux-g++
 QMAKE_LFLAGS		= $(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		= 
 QMAKE_LIBS_DYNLOAD      = -ldl
 QMAKE_LIBS_X11		= 
 QMAKE_LIBS_X11SM	= 
 QMAKE_LIBS_QT		= -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
 QMAKE_LIBS_QT_OPENGL	= -lqgl
 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
diff --git a/mkspecs/qws/linux-x86-g++/qmake.conf b/mkspecs/qws/linux-x86-g++/qmake.conf
index e5ac6d1..dfc5e30 100644
--- a/mkspecs/qws/linux-x86-g++/qmake.conf
+++ b/mkspecs/qws/linux-x86-g++/qmake.conf
@@ -1,76 +1,76 @@
 #
 # $Id$
 #
 # qmake configuration for linux-g++
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= g++
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS  -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 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_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(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		= 
 QMAKE_LIBS_DYNLOAD      = -ldl
 QMAKE_LIBS_X11		= 
 QMAKE_LIBS_X11SM	= 
 QMAKE_LIBS_QT		= -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
 QMAKE_LIBS_QT_OPENGL	= -lqgl
 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
diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf
index e718d2b..aa6251f 100644
--- a/mkspecs/qws/macx-generic-g++/qmake.conf
+++ b/mkspecs/qws/macx-generic-g++/qmake.conf
@@ -1,80 +1,80 @@
 #
 # $Id$
 #
 # qmake configuration for macx-g++ with Qt/Embedded
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 QMAKE_EXTENSION_SHLIB	= dylib
 
 QMAKE_CC		= $(TB)cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O2 -fno-default-inline
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline)
 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 -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 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_LINK		= $$QMAKE_CXX
 QMAKE_LINK_SHLIB	= $$QMAKE_CXX
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -dynamiclib 
 QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace
 QMAKE_LFLAGS_PLUGIN	= -bundle
 QMAKE_LFLAGS_SONAME	= 
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= 
 
 QMAKE_LIBS		=
 QMAKE_LIBS_X11		=
 QMAKE_LIBS_X11SM	=
 QMAKE_LIBS_QT		= -lqte
 QMAKE_LIBS_QT_THREAD	= -lqte-mt
 QMAKE_LIBS_QT_OPENGL	= -lqgl
 QMAKE_LIBS_THREAD	= 
 
 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
 
 
 
diff --git a/mkspecs/qws/qnx4-cc/qmake.conf b/mkspecs/qws/qnx4-cc/qmake.conf
index 1020a3e..ee4a9ec 100644
--- a/mkspecs/qws/qnx4-cc/qmake.conf
+++ b/mkspecs/qws/qnx4-cc/qmake.conf
@@ -1,70 +1,70 @@
 #
 # $Id$
 #
 # qmake configuration for qnx4-gcc
 #
  
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release no_mocdepend
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -WC,-sg $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON    = -w1
 QMAKE_CFLAGS_WARN_OFF   = -w0
-QMAKE_CFLAGS_RELEASE    = -O
+QMAKE_CFLAGS_RELEASE    = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
 QMAKE_CFLAGS_DEBUG	= -g2d
 QMAKE_CFLAGS_SHLIB	= 
 QMAKE_CFLAGS_YACC	= 
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT -WC,-bm
 
 QMAKE_CXX		= cc
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -DQWS  $(CXXFLAGS_EXTRA)
 DEFINES			+= QT_NO_SOUND QT_CLEAN_NAMESPACE QT_NO_QWS_TRANSFORMED QT_NO_QWS_MOUSE_AUTO QT_NO_QWS_MOUSE_MANUAL QT_NO_QWS_LINUXFB
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		= /usr/local/include /usr/include/graphics
 QMAKE_LIBDIR		= /usr/local/lib $(QTDIR)/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 
 QMAKE_LINK		= cc
 QMAKE_LINK_SHLIB	= cc
 QMAKE_LFLAGS		= -lsocket  $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	= -g2d
 QMAKE_LFLAGS_SHLIB	= -d
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= 
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= 
 
 QMAKE_LIBS		= -lsocket
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_QT		= -T 1 -lqte 
 QMAKE_LIBS_QT_THREAD	= -lqte-mt
 QMAKE_LIBS_THREAD	= 
 
 QMAKE_MOC		= $(QTDIR)/util/scripts/qnx4moc.sh $(CXXFLAGS) $(INCPATH)
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= wlib -n -c
 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
diff --git a/mkspecs/qws/qnx6-generic-cc/qmake.conf b/mkspecs/qws/qnx6-generic-cc/qmake.conf
index ef69f21..ae113fd 100644
--- a/mkspecs/qws/qnx6-generic-cc/qmake.conf
+++ b/mkspecs/qws/qnx6-generic-cc/qmake.conf
@@ -1,77 +1,77 @@
 #
 # $Id$
 #
 # qmake configuration for qnx-rtp-gcc
 #
  
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
  
 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	= -O
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= 
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
  
 QMAKE_CXX		= cc
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -DQWS -DQT_POSIX_QSHM -DQT_NO_SOUND -DQT_CLEAN_NAMESPACE -DQT_NO_QWS_TRANSFORMED -DQT_NO_QWS_MOUSE_AUTO -DQT_NO_QWS_MOUSE_MANUAL -DQT_NO_QWS_VFB -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_MULTIPROCESS $(CXXFLAGS_EXTRA)
 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_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_LINK		= cc
 QMAKE_LINK_SHLIB	= cc
 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		= -lsocket -lcpp
 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_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
 
diff --git a/mkspecs/qws/qnx6-generic-g++/qmake.conf b/mkspecs/qws/qnx6-generic-g++/qmake.conf
index df3c836..6961345 100644
--- a/mkspecs/qws/qnx6-generic-g++/qmake.conf
+++ b/mkspecs/qws/qnx6-generic-g++/qmake.conf
@@ -1,77 +1,77 @@
 #
 # $Id$
 #
 # qmake configuration for qnx-rtp-gcc
 #
  
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
  
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe -fno-inline -fno-pack-struct -fhonor-std -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -Wall
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
  
 QMAKE_CXX		= cc
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -DQWS -DQT_POSIX_QSHM -DQT_NO_QWS_MULTIPROCESS -DQT_NO_SOUND -DQT_CLEAN_NAMESPACE -DQT_NO_QWS_TRANSFORMED -DQT_NO_QWS_MOUSE_AUTO -DQT_NO_QWS_MOUSE_MANUAL -DQT_NO_PROCESS -DQT_NO_QWS_VFB -DQT_NO_QWS_LINUXFB $(CXXFLAGS_EXTRA)
 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_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_LINK		= cc -fhonor-std
 QMAKE_LINK_SHLIB	= cc -fhonor-std
 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		= -lsocket 
 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_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
 
diff --git a/mkspecs/qws/solaris-generic-g++/qmake.conf b/mkspecs/qws/solaris-generic-g++/qmake.conf
index d6048bb..d286d5b 100644
--- a/mkspecs/qws/solaris-generic-g++/qmake.conf
+++ b/mkspecs/qws/solaris-generic-g++/qmake.conf
@@ -1,76 +1,76 @@
 #
 # $Id$
 #
 # qmake configuration for solaris-g++ with Qt/Embedded
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O2 -fno-default-inline
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= g++
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -DQT_NO_SOUND -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 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_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(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		= -lsocket -lnsl -lresolv
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		=
 QMAKE_LIBS_X11SM	=
 QMAKE_LIBS_QT		= -lqte
 QMAKE_LIBS_QT_THREAD	= -lqte-mt
 QMAKE_LIBS_QT_OPENGL	= -lqgl
 QMAKE_LIBS_THREAD	= -lthread -lrt
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar cq
 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
diff --git a/mkspecs/reliant-cds-64/qmake.conf b/mkspecs/reliant-cds-64/qmake.conf
index fc7a3cf..c3ee3a8 100644
--- a/mkspecs/reliant-cds-64/qmake.conf
+++ b/mkspecs/reliant-cds-64/qmake.conf
@@ -1,81 +1,81 @@
 #
 # $Id$
 #
 # tmake configuration for Reliant UNIX 5.45 using the CDS++ C/C++ compiler V2.0C
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -Klp64 $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -v
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -KPIC
 QMAKE_CFLAGS_YACC	=
 QMAKE_CFLAGS_THREAD	= -K pthread
 
 QMAKE_CXX		= CC
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /opt/X/include/X11
 QMAKE_LIBDIR_X11	= /opt/X/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
 QMAKE_LINK		= CC
 QMAKE_LINK_SHLIB	= CC
 QMAKE_LFLAGS		= -Klp64 $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -G
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	= -K pthread
 QMAKE_RPATH		= -Wl,-Brpath=,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	=
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= CC -xar -o
 QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)/Templates.DB
 
 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
diff --git a/mkspecs/reliant-cds/qmake.conf b/mkspecs/reliant-cds/qmake.conf
index faaa26d..584bcf7 100644
--- a/mkspecs/reliant-cds/qmake.conf
+++ b/mkspecs/reliant-cds/qmake.conf
@@ -1,81 +1,81 @@
 #
 # $Id$
 #
 # tmake configuration for Reliant UNIX 5.45 using the CDS++ C/C++ compiler V2.0C
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -v
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -KPIC
 QMAKE_CFLAGS_YACC	=
 QMAKE_CFLAGS_THREAD	= -K pthread
 
 QMAKE_CXX		= CC
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /opt/X/include/X11
 QMAKE_LIBDIR_X11	= /opt/X/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
 QMAKE_LINK		= CC
 QMAKE_LINK_SHLIB	= CC
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -G
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	= -K pthread
 QMAKE_RPATH		= -Wl,-Brpath=,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	=
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= CC -xar -o
 QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)/Templates.DB
 
 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
diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf
index 54bcbfa..6c69a08 100644
--- a/mkspecs/sco-cc/qmake.conf
+++ b/mkspecs/sco-cc/qmake.conf
@@ -1,81 +1,81 @@
 #
 # $Id$
 #
 # qmake configuration for sco-cc
 #
 # -Wf,--diag_suppress,838
 # 	turns off warning about missing return types in X headers
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -KPIC
 QMAKE_CFLAGS_YACC	= -Wf,--diag_suppress,111 -Wf,--diag_suppress,177
 QMAKE_CFLAGS_THREAD	= -Kthread
 
 QMAKE_CXX		= CC
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 $(CXXFLAGS_EXTRA)
 QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
 QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE -Tused
 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		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	= /usr/X/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
 QMAKE_LINK		= CC
 QMAKE_LINK_SHLIB	= CC
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -G
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	= -Kthread
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu -lXt -lSM -lICE
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 
 QMAKE_LIBS_THREAD	=
 
 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
diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf
index 1c1e3c8..3044419 100644
--- a/mkspecs/sco-g++/qmake.conf
+++ b/mkspecs/sco-g++/qmake.conf
@@ -1,76 +1,76 @@
 #
 # $Id$
 #
 # qmake configuration for sco-g++
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= g++
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -G
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_RPATH		=
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lsocket -lm
 QMAKE_LIBS_QT		= -lqt
 
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 
 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
diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf
index 33fda82..b30f3e8 100644
--- a/mkspecs/solaris-cc-64/qmake.conf
+++ b/mkspecs/solaris-cc-64/qmake.conf
@@ -1,100 +1,100 @@
 #
 # $Id$
 #
 # qmake configuration for Sun WorkShop 5.0, Forte Developer 6,
 # 					and Sun ONE Studio 7 on Solaris
 #
 # From the standards(5) manual page:
 # 	The XNS4 specification is safe for use only in ILP32 (32-bit)
 # 	environments and should not be used for LP64 (64-bit)
 # 	application environments. Use XNS5, which has LP64-clean
 # 	interfaces that are portable across ILP32 and LP64 environments.
 # 	[...]
 # 	For platforms supporting the LP64 (64-bit) programming environment
 # 	where the SC5.0 Compilers have been installed, SUSv2-conforming LP64
 # 	applications using XNS5 library calls should be built with command
 # 	lines of the form:
 # 		c89 $(getconf XBS5_LP64_OFF64_CFLAGS) -D_XOPEN_SOURCE=500 \
 # 		    $(getconf XBS5_LP64_OFF64_LDFLAGS) foo.c -o foo \
 # 		    $(getconf XBS5_LP64_OFF64_LIBS) -lxnet
 # So it appears that _XOPEN_SOURCE=500 should be defined when building
 # 64-bit applications (on Solaris 7 and better). But then __EXTENSIONS__
 # should be defined as well to recover all the default system interface.
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -xM
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -KPIC
 QMAKE_CFLAGS_YACC	=
 QMAKE_CFLAGS_THREAD	= -mt
 
 QMAKE_CXX		= CC
 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	= -O2
 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		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/openwin/include
 QMAKE_LIBDIR_X11	= /usr/openwin/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/openwin/include
 QMAKE_LIBDIR_OPENGL	= /usr/openwin/lib
 
 QMAKE_LINK		= CC
 QMAKE_LINK_SHLIB	= CC
 QMAKE_LFLAGS		= -xarch=v9 $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -G
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	= -mt
 QMAKE_RPATH		= -R
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		=
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	= -lpthread
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= CC -xar -o
 QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache
 
 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
diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf
index 3d50180..8b096fe 100644
--- a/mkspecs/solaris-cc/qmake.conf
+++ b/mkspecs/solaris-cc/qmake.conf
@@ -1,83 +1,83 @@
 #
 # $Id$
 #
 # qmake configuration for Sun WorkShop 5.0, Forte Developer 6,
 # 					and Sun ONE Studio 7 on Solaris
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -xM
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -KPIC
 QMAKE_CFLAGS_YACC	=
 QMAKE_CFLAGS_THREAD	= -mt
 
 QMAKE_CXX		= CC
 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	= -O2
 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		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/openwin/include
 QMAKE_LIBDIR_X11	= /usr/openwin/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/openwin/include
 QMAKE_LIBDIR_OPENGL	= /usr/openwin/lib
 
 QMAKE_LINK		= CC
 QMAKE_LINK_SHLIB	= CC
 QMAKE_LFLAGS		= -R$(QTDIR)/lib $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -G
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	= -mt
 QMAKE_RPATH		= -R
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		=
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	= -lpthread
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= CC -xar -o
 QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache
 
 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
diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf
index 622644b..da83d25 100644
--- a/mkspecs/solaris-g++-64/qmake.conf
+++ b/mkspecs/solaris-g++-64/qmake.conf
@@ -1,103 +1,103 @@
 #
 # $Id$
 #
 # qmake configuration for solaris-g++64
 #
 # The X11 header files used to be broken on Solaris until patches were
 # released in early 2001 for Solaris 2.6, 7, and 8. On Solaris 2.5.1
 # or non-patched systems -fpermissive works around the incompatibility
 # between GCC 2.95 or better and Solaris - but we still get warnings
 # because we don't use -isystem.
 # 
 # From the standards(5) manual page:
 # 	The XNS4 specification is safe for use only in ILP32 (32-bit)
 # 	environments and should not be used for LP64 (64-bit)
 # 	application environments. Use XNS5, which has LP64-clean
 # 	interfaces that are portable across ILP32 and LP64 environments.
 # 	[...]
 # 	For platforms supporting the LP64 (64-bit) programming environment
 # 	where the SC5.0 Compilers have been installed, SUSv2-conforming LP64
 # 	applications using XNS5 library calls should be built with command
 # 	lines of the form:
 # 		c89 $(getconf XBS5_LP64_OFF64_CFLAGS) -D_XOPEN_SOURCE=500 \
 # 		    $(getconf XBS5_LP64_OFF64_LDFLAGS) foo.c -o foo \
 # 		    $(getconf XBS5_LP64_OFF64_LIBS) -lxnet
 # So it appears that _XOPEN_SOURCE=500 should be defined when building
 # 64-bit applications (on Solaris 7 and better). But then __EXTENSIONS__
 # should be defined as well to recover all the default system interface.
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -m64 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= g++
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/openwin/include
 QMAKE_LIBDIR_X11	= /usr/openwin/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/openwin/include
 QMAKE_LIBDIR_OPENGL	= /usr/openwin/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= -m64 $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	= -g
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -Wl,-R,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		=
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	= -lthread
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar cq
 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
diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf
index 71f4307..2f3c752 100644
--- a/mkspecs/solaris-g++/qmake.conf
+++ b/mkspecs/solaris-g++/qmake.conf
@@ -1,86 +1,86 @@
 #
 # $Id$
 #
 # qmake configuration for solaris-g++
 #
 # The X11 header files used to be broken on Solaris until patches were
 # released in early 2001 for Solaris 2.6, 7, and 8. On Solaris 2.5.1
 # or non-patched systems -fpermissive works around the incompatibility
 # between GCC 2.95 or better and Solaris - but we still get warnings
 # because we don't use -isystem.
 # 
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= g++
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/openwin/include
 QMAKE_LIBDIR_X11	= /usr/openwin/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/openwin/include
 QMAKE_LIBDIR_OPENGL	= /usr/openwin/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	= -g
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -Wl,-R,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		=
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	= -lpthread
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar cq
 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
diff --git a/mkspecs/solaris-kcc/qmake.conf b/mkspecs/solaris-kcc/qmake.conf
index e1c3052..2c325e8 100644
--- a/mkspecs/solaris-kcc/qmake.conf
+++ b/mkspecs/solaris-kcc/qmake.conf
@@ -1,94 +1,94 @@
 #
 # $Id$
 #
 # qmake configuration for KAI C++ 4.0f for Solaris
 #
 # From the KAI C++ man page for Solaris:
 # --[no_]thread_safe
 # 	[Waive or] Request thread-safe handling of system-allocated objects.
 # 	To guarantee thread safety, this option must be used when both
 # 	compiling and linking. Thread-safe C++ is not link-compatible with
 # 	(the default) non-thread-safe C++.
 # -mt
 # 	Solaris-only synonym for the portable option --thread_safe.
 # -h libname
 # 	Solaris-only synonym for the portable --soname option.
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= KCC
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= --c --display_error_number $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= +K2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), +K2)
 QMAKE_CFLAGS_DEBUG	= +K0
 QMAKE_CFLAGS_SHLIB	= -KPIC
 QMAKE_CFLAGS_YACC	= --diag_suppress 111,177
 QMAKE_CFLAGS_THREAD	= -mt
 
 QMAKE_CXX		= KCC
 QMAKE_CXXFLAGS		= --display_error_number --diag_suppress 611,1142 $(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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/openwin/include
 QMAKE_LIBDIR_X11	= /usr/openwin/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/openwin/include
 QMAKE_LIBDIR_OPENGL	= /usr/openwin/lib
 
 QMAKE_LINK		= KCC
 QMAKE_LINK_SHLIB	= KCC
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	=
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	= -mt
 QMAKE_RPATH		= -R$$LITERAL_WHITESPACE
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		=
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	=
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar cq
 QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)ti_files
 
 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
 
diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf
index 41279b4..be67cf3 100644
--- a/mkspecs/tru64-cxx/qmake.conf
+++ b/mkspecs/tru64-cxx/qmake.conf
@@ -1,79 +1,79 @@
 #
 # $Id$
 #
 # tmake configuration for tru64-cxx
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= cxx
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	=
 QMAKE_CFLAGS_YACC	= -Olimit 1000
 QMAKE_CFLAGS_THREAD	= -pthread
 
 QMAKE_CXX		= cxx
 QMAKE_CXXFLAGS		= -x cxx $$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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
 QMAKE_LINK		= cxx
 QMAKE_LINK_SHLIB	= cxx
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_THREAD	= -pthread
 QMAKE_LFLAGS_SONAME	= -soname$$LITERAL_WHITESPACE
 QMAKE_RPATH             = -rpath$$LITERAL_WHITESPACE
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	= 
 
 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
diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf
index ad2c06e..c71b0ae 100644
--- a/mkspecs/tru64-g++/qmake.conf
+++ b/mkspecs/tru64-g++/qmake.conf
@@ -1,79 +1,79 @@
 #
 # $Id$
 #
 # qmake configuration for tru64-g++
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= g++
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_THREAD	=
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_RPATH             = -Wl,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_LIBS_THREAD	= -lpthread -lexc
 
 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
diff --git a/mkspecs/ultrix-g++/qmake.conf b/mkspecs/ultrix-g++/qmake.conf
index 2b847cb..347c543 100644
--- a/mkspecs/ultrix-g++/qmake.conf
+++ b/mkspecs/ultrix-g++/qmake.conf
@@ -1,72 +1,72 @@
 #
 # $Id$
 #
 # qmake configuration for ultrix-g++
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	=
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 
 QMAKE_CXX		= g++
 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		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 #QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 #QMAKE_LFLAGS_SHLIB	= -shared
 #QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 #QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 
 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
diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf
index 46b4657..e2e73fe 100644
--- a/mkspecs/unixware-cc/qmake.conf
+++ b/mkspecs/unixware-cc/qmake.conf
@@ -1,81 +1,81 @@
 #
 # $Id$
 #
 # qmake configuration for UnixWare 7 or Open UNIX 8 with UDK or OUDK
 #
 # -Wf,--diag_suppress,838
 # 	turns off warning about missing return types in X headers
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -KPIC
 QMAKE_CFLAGS_YACC	= -Wf,--diag_suppress,111 -Wf,--diag_suppress,177
 QMAKE_CFLAGS_THREAD	= -Kthread
 
 QMAKE_CXX		= CC
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 $(CXXFLAGS_EXTRA)
 QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
 QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE -Tused
 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		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	= /usr/X/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
 QMAKE_LINK		= CC
 QMAKE_LINK_SHLIB	= CC
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -G
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	= -Kthread
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu -lXt -lSM -lICE
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 
 QMAKE_LIBS_THREAD	=
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar cq
 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
diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf
index 2ff9d3a..93ad257 100644
--- a/mkspecs/unixware-g++/qmake.conf
+++ b/mkspecs/unixware-g++/qmake.conf
@@ -1,80 +1,80 @@
 #
 # $Id$
 #
 # qmake configuration for UnixWare 7 or Open UNIX 8 with OSTK
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	=
 
 QMAKE_CXX		= g++
 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_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	= /usr/X/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	=
 QMAKE_LFLAGS_THREAD	=
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt
 QMAKE_LIBS_QT_THREAD	= -lqt-mt
 
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu -lXt -lSM -lICE
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 
 QMAKE_LIBS_THREAD	= -lthread
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar cq
 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
diff --git a/mkspecs/win32-borland/qmake.conf b/mkspecs/win32-borland/qmake.conf
index c7b8229..a6339b9 100644
--- a/mkspecs/win32-borland/qmake.conf
+++ b/mkspecs/win32-borland/qmake.conf
@@ -1,97 +1,97 @@
 #
 # $Id$
 #
 # qmake configuration for Win32/Borland C++
 #
 
 MAKEFILE_GENERATOR	= BMAKE
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 DEFINES			+= UNICODE
 QMAKE_NOFORCE		= 1
 
 exists( $(QTDIR)\.qtwinconfig ) {
 	include( $(QTDIR)\.qtwinconfig )
 }
 
 QMAKE_CC		= bcc32
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= byacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -tWR $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -w -w-hid
 QMAKE_CFLAGS_WARN_OFF	= -w-
-QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
 QMAKE_CFLAGS_DEBUG	= -v
 QMAKE_CFLAGS_MT		= -tWM
 QMAKE_CFLAGS_MT_DBG	= -tWM
 QMAKE_CFLAGS_MT_DLL	= -tWM
 QMAKE_CFLAGS_MT_DLLDBG	= -tWM
 QMAKE_CFLAGS_YACC	=
 QMAKE_CFLAGS_CONSOLE	= -tWC
 
 !contains(CONFIG,exceptions){
 	QMAKE_CFLAGS += -x-
 }
 !contains(CONFIG,rtti){
 	QMAKE_CFLAGS	+= -RT- $(CFLAGS_EXTRA)
 }
 
 QMAKE_CXX		= $$QMAKE_CC
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
 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_MT	= $$QMAKE_CFLAGS_MT
 QMAKE_CXXFLAGS_MT_DBG	= $$QMAKE_CFLAGS_MT_DBG
 QMAKE_CXXFLAGS_MT_DLL	= $$QMAKE_CFLAGS_MT_DLL
 QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG
 QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_CONSOLE	= $$QMAKE_CFLAGS_CONSOLE
 
 QMAKE_INCDIR		=
 QMAKE_INCDIR_QT		= $(QTDIR)\include
 QMAKE_LIBDIR		= $(BCB)\lib
 QMAKE_LIBDIR_QT		= $(QTDIR)\lib
 
 QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src
 QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $<
 QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src
 QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $<
 
 QMAKE_LINK		= ilink32
 QMAKE_LFLAGS		= -c -x -Gn $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	= -v
 QMAKE_LFLAGS_CONSOLE	= -ap -Tpe c0x32.obj
 QMAKE_LFLAGS_WINDOWS	= -aa -Tpe c0w32.obj
 QMAKE_LFLAGS_CONSOLE_DLL= -Gi -ap -Tpd c0d32.obj
 QMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj
 
 QMAKE_LIBS		= import32.lib
 QMAKE_LIBS_RT		= cw32i.lib
 QMAKE_LIBS_RTMT		= cw32mti.lib
 QMAKE_LIBS_CONSOLE	=
 QMAKE_LIBS_WINDOWS	=
 QMAKE_LIBS_QT		= qt.lib
 QMAKE_LIBS_QT_THREAD	= qtmt.lib
 QMAKE_LIBS_QT_ENTRY	= qtmain.lib
 
 QMAKE_LIBS_OPENGL	=
 QMAKE_LFLAGS_OPENGL	= /dopengl32.dll
 
 QMAKE_MOC		= $(QTDIR)\bin\moc.exe
 QMAKE_UIC		= $(QTDIR)\bin\uic.exe
 QMAKE_IDC		= $(QTDIR)\bin\idc.exe
 
 QMAKE_IDL		= midl
 QMAKE_LIB		= tlib /C /P256
 QMAKE_RC		= brcc32
 
 QMAKE_ZIP		= zip -r -9
 
 QMAKE_COPY		= copy
 QMAKE_MOVE		= move
 QMAKE_DEL		= del
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 8a24c43..2410e34 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -1,70 +1,70 @@
 #
 # $Id$
 #
 # qmake configuration for Win32/g++ (Cygnus gnu-win32)
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= byacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -fvtable-thunks $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 
 QMAKE_CXX		= g++
 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_YACC	= $$QMAKE_CFLAGS_YACC
 
 QMAKE_INCDIR		=
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 
 QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 QMAKE_LINK		= g++
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_CONSOLE	= -Wl,-subsystem,console
 QMAKE_LFLAGS_WINDOWS	= -Wl,-subsystem,windows
 QMAKE_LFLAGS_CONSOLE_DLL= -Wl,-subsystem,console
 QMAKE_LFLAGS_WINDOWS_DLL= -Wl,-subsystem,windows
 
 QMAKE_LIBS		=
 QMAKE_LIBS_CONSOLE	=
 QMAKE_LIBS_WINDOWS	= -luser32 -lgdi32 -lcomdlg32 -lwinmm -limm32 -lole32 -luuid -lwsock32
 QMAKE_LIBS_QT		= -L$(QTDIR)/lib -lqt
 QMAKE_LIBS_QT_ENTRY	= -lqtmain
 
 QMAKE_LIBS_OPENGL	= -lopengl32
 
 QMAKE_MOC		= $(QTDIR)/bin/moc.exe
 QMAKE_UIC		= $(QTDIR)/bin/uic.exe
 QMAKE_IDC		= $(QTDIR)/bin/idc.exe
 
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
 QMAKE_ZIP		= zip -r -9
 
 QMAKE_COPY		= copy
 QMAKE_MOVE		= move
 QMAKE_DEL_FILE		= del
 QMAKE_DEL_DIR		= deltree
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index b5476a0..0a7d113 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -1,99 +1,99 @@
 #
 # $Id$
 #
 # qmake configuration for Win32/Intel C++
 #
 
 MAKEFILE_GENERATOR	= MSVC
 TEMPLATE		= app
 CONFIG			+= qt warn_on release incremental
 DEFINES			+= UNICODE
 
 exists( $(QTDIR)\.qtwinconfig ) {
 	include( $(QTDIR)\.qtwinconfig )
 }
 
 QMAKE_CC		= icl
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= byacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -nologo -Zm200 $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -W3
 QMAKE_CFLAGS_WARN_OFF	= -W0
-QMAKE_CFLAGS_RELEASE	= -Od -Ob1s
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Od -Ob1s)
 QMAKE_CFLAGS_DEBUG	= -Zi
 QMAKE_CFLAGS_MT		= -MD
 QMAKE_CFLAGS_MT_DBG	= -MDd
 QMAKE_CFLAGS_MT_DLL	= -MD
 QMAKE_CFLAGS_MT_DLLDBG	= -MDd
 QMAKE_CFLAGS_YACC	=
 
 contains(CONFIG,stl){
 	QMAKE_CFLAGS	+= -GX $(CFLAGS_EXTRA)
 }
 contains(CONFIG,exceptions){
 	QMAKE_CFLAGS += -GX
 }
 contains(CONFIG,rtti){
 	QMAKE_CFLAGS	+= -GR $(CFLAGS_EXTRA)
 }
 
 QMAKE_CXX		= $$QMAKE_CC
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
 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_MT	= $$QMAKE_CFLAGS_MT
 QMAKE_CXXFLAGS_MT_DBG	= $$QMAKE_CFLAGS_MT_DBG
 QMAKE_CXXFLAGS_MT_DLL	= $$QMAKE_CFLAGS_MT_DLL
 QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG
 QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_STL	= $$QMAKE_CFLAGS_STL
 
 QMAKE_INCDIR		=
 QMAKE_INCDIR_QT		= $(QTDIR)\include
 QMAKE_LIBDIR_QT		= $(QTDIR)\lib
 
 QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
 QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
 
 QMAKE_LINK		= link
 QMAKE_LFLAGS		= /NOLOGO $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll
 QMAKE_LFLAGS_DEBUG	= /DEBUG
 QMAKE_LFLAGS_CONSOLE	= /SUBSYSTEM:console
 QMAKE_LFLAGS_WINDOWS	= /SUBSYSTEM:windows
 QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL
 QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL
 QMAKE_LFLAGS_QT_DLL	= /BASE:0x39D00000
 
 QMAKE_LIBS		=
 QMAKE_LIBS_CONSOLE	=
 QMAKE_LIBS_WINDOWS	= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib
 QMAKE_LIBS_QT		= $(QTDIR)\lib\qt.lib
 QMAKE_LIBS_QT_THREAD	= $(QTDIR)\lib\qt-mt.lib
 QMAKE_LIBS_QT_ENTRY	= $(QTDIR)\lib\qtmain.lib
 
 QMAKE_LIBS_OPENGL	= opengl32.lib glu32.lib delayimp.lib
 QMAKE_LFLAGS_OPENGL	= /DELAYLOAD:opengl32.dll
 
 QMAKE_MOC		= $(QTDIR)\bin\moc.exe
 QMAKE_UIC		= $(QTDIR)\bin\uic.exe
 QMAKE_IDC		= $(QTDIR)\bin\idc.exe
 
 QMAKE_IDL		= midl
 QMAKE_LIB		= lib /NOLOGO
 QMAKE_RC		= rc
 
 QMAKE_ZIP		= zip -r -9
 
 QMAKE_COPY		= copy
 QMAKE_MOVE		= move
 QMAKE_DEL_FILE		= del
 QMAKE_DEL_DIR		= deltree
 
 DSP_EXTENSION		= .dsp
diff --git a/mkspecs/win32-msvc.net/qmake.conf b/mkspecs/win32-msvc.net/qmake.conf
index d75a251..6c4185f 100644
--- a/mkspecs/win32-msvc.net/qmake.conf
+++ b/mkspecs/win32-msvc.net/qmake.conf
@@ -1,104 +1,104 @@
 #
 # $Id$
 #
 # qmake configuration for Win32/Microsoft C++.NET
 #
 
 MAKEFILE_GENERATOR	= MSVC.NET
 TEMPLATE		= app
 CONFIG			+= qt warn_on release incremental
 DEFINES			+= UNICODE WIN32 NDEBUG
 
 exists( $(QTDIR)\.qtwinconfig ) {
 	include( $(QTDIR)\.qtwinconfig )
 }
 
 QMAKE_CC		= cl
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= byacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -nologo -Zm200 $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -W3
 QMAKE_CFLAGS_WARN_OFF	= -W0
-QMAKE_CFLAGS_RELEASE	= -O1
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O1)
 QMAKE_CFLAGS_DEBUG	= -Z7
 QMAKE_CFLAGS_MT		= -MD
 QMAKE_CFLAGS_MT_DBG	= -MD
 QMAKE_CFLAGS_MT_DLL	= -MD
 QMAKE_CFLAGS_MT_DLLDBG	= -MD
 QMAKE_CFLAGS_ST		= -ML
 QMAKE_CFLAGS_ST_DBG	= -MLd
 QMAKE_CFLAGS_YACC	=
 
 contains(CONFIG,stl){
 	QMAKE_CFLAGS	+= -GX $(CFLAGS_EXTRA)
 }
 contains(CONFIG,exceptions){
 	QMAKE_CFLAGS += -GX
 }
 contains(CONFIG,rtti){
 	QMAKE_CFLAGS	+= -GR $(CFLAGS_EXTRA)
 }
 
 QMAKE_CXX		= $$QMAKE_CC
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
 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_MT	= $$QMAKE_CFLAGS_MT
 QMAKE_CXXFLAGS_MT_DBG	= $$QMAKE_CFLAGS_MT_DBG
 QMAKE_CXXFLAGS_MT_DLL	= $$QMAKE_CFLAGS_MT_DLL
 QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG
 QMAKE_CXXFLAGS_ST	= $$QMAKE_CFLAGS_ST
 QMAKE_CXXFLAGS_ST_DBG	= $$QMAKE_CFLAGS_ST_DBG
 QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_STL	= $$QMAKE_CFLAGS_STL
 
 QMAKE_INCDIR		=
 QMAKE_INCDIR_QT		= $(QTDIR)\include
 QMAKE_LIBDIR_QT		= $(QTDIR)\lib
 
 QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
 QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
 
 QMAKE_LINK		= link
 QMAKE_LFLAGS		= /NOLOGO $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	= /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll
 QMAKE_LFLAGS_DEBUG	= /DEBUG
 QMAKE_LFLAGS_CONSOLE	= /SUBSYSTEM:CONSOLE
 QMAKE_LFLAGS_WINDOWS	= /SUBSYSTEM:WINDOWS
 QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:CONSOLE /DLL
 QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:WINDOWS /DLL
 QMAKE_LFLAGS_QT_DLL	= /BASE:0x39D00000
 
 QMAKE_LIBS		=
 QMAKE_LIBS_CONSOLE	=
 QMAKE_LIBS_WINDOWS	= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib
 QMAKE_LIBS_QT		= qt.lib
 QMAKE_LIBS_QT_THREAD	= qt-mt.lib
 QMAKE_LIBS_QT_ENTRY	= qtmain.lib
 
 QMAKE_LIBS_OPENGL	= opengl32.lib glu32.lib delayimp.lib
 QMAKE_LFLAGS_OPENGL	= /DELAYLOAD:opengl32.dll
 
 QMAKE_MOC		= $(QTDIR)\bin\moc.exe
 QMAKE_UIC		= $(QTDIR)\bin\uic.exe
 QMAKE_IDC		= $(QTDIR)\bin\idc.exe
 
 QMAKE_IDL		= midl
 QMAKE_LIB		= lib /NOLOGO
 QMAKE_RC		= rc
 
 QMAKE_ZIP		= zip -r -9
 
 QMAKE_COPY		= copy
 QMAKE_MOVE		= move
 QMAKE_DEL_FILE		= del
 QMAKE_DEL_DIR		= deltree
 
 VCPROJ_EXTENSION	= .vcproj
 VCSOLUTION_EXTENSION	= .vcs
diff --git a/mkspecs/win32-msvc/qmake.conf b/mkspecs/win32-msvc/qmake.conf
index f3be273..3a6e650 100644
--- a/mkspecs/win32-msvc/qmake.conf
+++ b/mkspecs/win32-msvc/qmake.conf
@@ -1,99 +1,99 @@
 #
 # $Id$
 #
 # qmake configuration for Win32/Microsoft C++
 #
 
 MAKEFILE_GENERATOR	= MSVC
 TEMPLATE		= app
 CONFIG			+= qt warn_on release incremental flat
 DEFINES			+= UNICODE
 
 exists( $(QTDIR)\.qtwinconfig ) {
 	include( $(QTDIR)\.qtwinconfig )
 }
 
 QMAKE_CC		= cl
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= byacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -nologo -Zm200 $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -W3
 QMAKE_CFLAGS_WARN_OFF	= -W0
-QMAKE_CFLAGS_RELEASE	= -O1
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O1)
 QMAKE_CFLAGS_DEBUG	= -Zi
 QMAKE_CFLAGS_MT		= -MD
 QMAKE_CFLAGS_MT_DBG	= -MDd
 QMAKE_CFLAGS_MT_DLL	= -MD
 QMAKE_CFLAGS_MT_DLLDBG	= -MDd
 QMAKE_CFLAGS_YACC	=
 
 contains(CONFIG,stl){
 	QMAKE_CFLAGS	+= -GX $(CFLAGS_EXTRA)
 }
 contains(CONFIG,exceptions){
 	QMAKE_CFLAGS += -GX
 }
 contains(CONFIG,rtti){
 	QMAKE_CFLAGS	+= -GR $(CFLAGS_EXTRA)
 }
 
 QMAKE_CXX		= $$QMAKE_CC
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
 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_MT	= $$QMAKE_CFLAGS_MT
 QMAKE_CXXFLAGS_MT_DBG	= $$QMAKE_CFLAGS_MT_DBG
 QMAKE_CXXFLAGS_MT_DLL	= $$QMAKE_CFLAGS_MT_DLL
 QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG
 QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_STL	= $$QMAKE_CFLAGS_STL
 
 QMAKE_INCDIR		=
 QMAKE_INCDIR_QT		= $(QTDIR)\include
 QMAKE_LIBDIR_QT		= $(QTDIR)\lib
 
 QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
 QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
 
 QMAKE_LINK		= link
 QMAKE_LFLAGS		= /NOLOGO $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll
 QMAKE_LFLAGS_DEBUG	= /DEBUG
 QMAKE_LFLAGS_CONSOLE	= /SUBSYSTEM:console
 QMAKE_LFLAGS_WINDOWS	= /SUBSYSTEM:windows
 QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL
 QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL
 QMAKE_LFLAGS_QT_DLL	= /BASE:0x39D00000
 
 QMAKE_LIBS		=
 QMAKE_LIBS_CONSOLE	=
 QMAKE_LIBS_WINDOWS	= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib
 QMAKE_LIBS_QT		= qt.lib
 QMAKE_LIBS_QT_THREAD	= qt-mt.lib
 QMAKE_LIBS_QT_ENTRY	= qtmain.lib
 
 QMAKE_LIBS_OPENGL	= opengl32.lib glu32.lib delayimp.lib
 QMAKE_LFLAGS_OPENGL	= /DELAYLOAD:opengl32.dll
 
 QMAKE_MOC		= $(QTDIR)\bin\moc.exe
 QMAKE_UIC		= $(QTDIR)\bin\uic.exe
 QMAKE_IDC		= $(QTDIR)\bin\idc.exe
 
 QMAKE_IDL		= midl
 QMAKE_LIB		= lib /NOLOGO
 QMAKE_RC		= rc
 
 QMAKE_ZIP		= zip -r -9
 
 QMAKE_COPY		= copy
 QMAKE_MOVE		= move
 QMAKE_DEL_FILE		= del
 QMAKE_DEL_DIR		= deltree
 
 DSP_EXTENSION		= .dsp
diff --git a/mkspecs/win32-visage/qmake.conf b/mkspecs/win32-visage/qmake.conf
index aa8e598..87b3b8f 100644
--- a/mkspecs/win32-visage/qmake.conf
+++ b/mkspecs/win32-visage/qmake.conf
@@ -1,67 +1,67 @@
 #
 # $Id$
 #
 # qmake configuration for Win32/IBM Visual Age
 #
 
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= icc -C
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= byacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -Q -Ft -Gd -Gm+ -qrtti=all $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -W3
 QMAKE_CFLAGS_WARN_OFF	= -W0
-QMAKE_CFLAGS_RELEASE	= -Gl+ -O -Oc+
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Gl+ -O -Oc+)
 QMAKE_CFLAGS_DEBUG	= -Fb* -Ti -Tm
 QMAKE_CFLAGS_YACC	=
 
 QMAKE_CXX		= $$QMAKE_CC
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
 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_YACC	= $$QMAKE_CFLAGS_YACC
 
 QMAKE_INCDIR		=
 QMAKE_INCDIR_QT		= $(QTDIR)\include
 
 QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$obj" $src
 QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$@" $<
 QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$obj" $src
 QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $<
 
 QMAKE_LINK		= icc -Tdp $(CFLAGS)
 QMAKE_LFLAGS		= -nologo -code:RX -data:RW -def -noe $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	= -OPTF
 QMAKE_LFLAGS_DEBUG	= -de -br
 QMAKE_LFLAGS_CONSOLE	= -pmtype:vio
 QMAKE_LFLAGS_WINDOWS	= -pmtype:pm
 QMAKE_LFLAGS_CONSOLE_DLL= -DLL
 QMAKE_LFLAGS_WINDOWS_DLL= -DLL
 
 QMAKE_LIBS		=
 QMAKE_LIBS_CONSOLE	=
 QMAKE_LIBS_WINDOWS	= user32.lib gdi32.lib comdlg32.lib imm32.lib winmm.lib ole32.lib uuid.lib wsock32.lib
 QMAKE_LIBS_QT		= $(QTDIR)\lib\qt.lib
 QMAKE_LIBS_QT_ENTRY	= $(QTDIR)\lib\qtmain.lib
 
 QMAKE_LIBS_OPENGL	= opengl32.lib glu32.lib
 
 QMAKE_MOC		= $(QTDIR)/bin/moc.exe
 QMAKE_UIC		= $(QTDIR)/bin/uic.exe
 QMAKE_IDC		= $(QTDIR)/bin/idc.exe
 
 QMAKE_LIB		= ilib
 QMAKE_RC		= rc
 
 QMAKE_ZIP		= zip -r -9
 
 QMAKE_COPY		= copy
 QMAKE_MOVE		= move
 QMAKE_DEL_FILE		= del
 QMAKE_DEL_DIR		= deltree
diff --git a/mkspecs/win32-watcom/qmake.conf b/mkspecs/win32-watcom/qmake.conf
index dd3a71d..1c4760f 100644
--- a/mkspecs/win32-watcom/qmake.conf
+++ b/mkspecs/win32-watcom/qmake.conf
@@ -1,65 +1,65 @@
 #
 # $Id$
 #
 # qmake configuration for Win32/Watcom C++
 #
 
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 
 QMAKE_CC		= wcl386
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= byacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -zq $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -w2
 QMAKE_CFLAGS_WARN_OFF	= -w0
-QMAKE_CFLAGS_RELEASE	= -ox
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -ox)
 QMAKE_CFLAGS_DEBUG	= -d2
 QMAKE_CFLAGS_YACC	=
 
 QMAKE_CXX		= $$QMAKE_CC
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
 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_YACC	= $$QMAKE_CFLAGS_YACC
 
 QMAKE_INCDIR		=
 QMAKE_INCDIR_QT		= $(QTDIR)\include
 
 QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -fo=$obj $src
 QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src
 
 QMAKE_LINK		= wlink
 QMAKE_LFLAGS		= op quiet op c $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	= d all
 QMAKE_LFLAGS_CONSOLE	= sys nt
 QMAKE_LFLAGS_WINDOWS	= sys nt_win
 QMAKE_LFLAGS_CONSOLE_DLL= sys nt
 QMAKE_LFLAGS_WINDOWS_DLL= sys nt_win
 
 QMAKE_LIBS		=
 QMAKE_LIBS_CONSOLE	=
 QMAKE_LIBS_WINDOWS	=
 QMAKE_LIBS_QT		= %QTDIR%\lib\qt.lib
 QMAKE_LIBS_QT_ENTRY	= %QTDIR%\lib\qtmain.lib
 
 QMAKE_LIBS_OPENGL	= opengl32.lib
 
 QMAKE_MOC		= $(QTDIR)/bin/moc.exe
 QMAKE_UIC		= $(QTDIR)/bin/uic.exe
 QMAKE_IDC		= $(QTDIR)/bin/idc.exe
 
 QMAKE_LIB		= wlib -b -c -n -q -p=512
 QMAKE_RC		= rc
 
 QMAKE_ZIP		= zip -r -9
 
 QMAKE_COPY		= copy
 QMAKE_MOVE		= move
 QMAKE_DEL_FILE		= del
 QMAKE_DEL_DIR		= deltree