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
@@ -8,25 +8,25 @@ 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
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
@@ -8,25 +8,25 @@ 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
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
@@ -8,25 +8,25 @@ 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
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
@@ -10,25 +10,25 @@ 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
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
@@ -9,25 +9,25 @@ 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
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
@@ -8,25 +8,25 @@ 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
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
@@ -10,25 +10,25 @@ 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
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
@@ -8,25 +8,25 @@ 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
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
@@ -50,25 +50,25 @@
         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
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
@@ -50,25 +50,25 @@
         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
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
@@ -29,25 +29,25 @@
         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
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
@@ -30,25 +30,25 @@
         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
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
@@ -12,25 +12,25 @@ 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
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
@@ -11,25 +11,25 @@ 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
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
@@ -40,25 +40,25 @@ 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
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
@@ -14,25 +14,25 @@ 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
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
@@ -40,25 +40,25 @@ 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
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
@@ -8,25 +8,25 @@ 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
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
@@ -8,25 +8,25 @@ 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
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
@@ -9,25 +9,25 @@ 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
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
@@ -8,25 +8,25 @@ 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
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
@@ -15,25 +15,25 @@ 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
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
@@ -8,25 +8,25 @@ 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
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
@@ -10,25 +10,25 @@ CONFIG			+= qt warn_on release resource_fork incremental global_init_link_order
 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
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
@@ -9,25 +9,25 @@ 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
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
@@ -8,25 +8,25 @@ 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
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
@@ -8,25 +8,25 @@ 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
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
@@ -10,25 +10,25 @@ 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
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
@@ -8,25 +8,25 @@ 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
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
@@ -7,25 +7,25 @@
         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
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
@@ -7,25 +7,25 @@
         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
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
@@ -7,25 +7,25 @@
         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
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
@@ -7,25 +7,25 @@
         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
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
@@ -7,25 +7,25 @@
         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
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
@@ -7,25 +7,25 @@
         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
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
@@ -8,25 +8,25 @@ 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
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
@@ -7,25 +7,25 @@
         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
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
@@ -7,25 +7,25 @@
         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
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
@@ -7,25 +7,25 @@
         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
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
@@ -7,25 +7,25 @@
         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
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
@@ -8,25 +8,25 @@ 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
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
@@ -8,25 +8,25 @@ 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
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
@@ -10,25 +10,25 @@
         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
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
@@ -8,25 +8,25 @@ 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
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
@@ -26,25 +26,25 @@ 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
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
@@ -9,25 +9,25 @@ 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
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
@@ -31,25 +31,25 @@ 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
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
@@ -14,25 +14,25 @@ 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
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
@@ -19,25 +19,25 @@ 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
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
@@ -8,25 +8,25 @@ 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
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
@@ -8,25 +8,25 @@ 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
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
@@ -8,25 +8,25 @@ 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
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
@@ -10,25 +10,25 @@
         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
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
@@ -8,25 +8,25 @@ 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
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
@@ -13,25 +13,25 @@ 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){
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
@@ -8,25 +8,25 @@ 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
 
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
@@ -12,25 +12,25 @@ 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
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
@@ -12,25 +12,25 @@ 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)
 }
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
@@ -12,25 +12,25 @@ 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
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
@@ -6,25 +6,25 @@
 
         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    =
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
@@ -6,25 +6,25 @@
 
         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    =