1 files changed, 1 insertions, 1 deletions
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
@@ -7,49 +7,49 @@
 # --[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

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
@@ -7,49 +7,49 @@
7	# --[no_]thread_safe	7	# --[no_]thread_safe
8	# [Waive or] Request thread-safe handling of system-allocated objects.	8	# [Waive or] Request thread-safe handling of system-allocated objects.
9	# To guarantee thread safety, this option must be used when both	9	# To guarantee thread safety, this option must be used when both
10	# compiling and linking. Thread-safe C++ is not link-compatible with	10	# compiling and linking. Thread-safe C++ is not link-compatible with
11	# (the default) non-thread-safe C++.	11	# (the default) non-thread-safe C++.
12	# -mt	12	# -mt
13	# Solaris-only synonym for the portable option --thread_safe.	13	# Solaris-only synonym for the portable option --thread_safe.
14	# -h libname	14	# -h libname
15	# Solaris-only synonym for the portable --soname option.	15	# Solaris-only synonym for the portable --soname option.
16	#	16	#
17		17
18	MAKEFILE_GENERATOR= UNIX	18	MAKEFILE_GENERATOR= UNIX
19	TEMPLATE = app	19	TEMPLATE = app
20	CONFIG += qt warn_on release	20	CONFIG += qt warn_on release
21		21
22	QMAKE_CC = KCC	22	QMAKE_CC = KCC
23	QMAKE_LEX = flex	23	QMAKE_LEX = flex
24	QMAKE_LEXFLAGS =	24	QMAKE_LEXFLAGS =
25	QMAKE_YACC = yacc	25	QMAKE_YACC = yacc
26	QMAKE_YACCFLAGS = -d	26	QMAKE_YACCFLAGS = -d
27	QMAKE_CFLAGS = --c --display_error_number $(CFLAGS_EXTRA)	27	QMAKE_CFLAGS = --c --display_error_number $(CFLAGS_EXTRA)
28	QMAKE_CFLAGS_DEPS= -M	28	QMAKE_CFLAGS_DEPS= -M
29	QMAKE_CFLAGS_WARN_ON=	29	QMAKE_CFLAGS_WARN_ON=
30	QMAKE_CFLAGS_WARN_OFF= -w	30	QMAKE_CFLAGS_WARN_OFF= -w
31	QMAKE_CFLAGS_RELEASE= +K2	31	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), +K2)
32	QMAKE_CFLAGS_DEBUG= +K0	32	QMAKE_CFLAGS_DEBUG= +K0
33	QMAKE_CFLAGS_SHLIB= -KPIC	33	QMAKE_CFLAGS_SHLIB= -KPIC
34	QMAKE_CFLAGS_YACC= --diag_suppress 111,177	34	QMAKE_CFLAGS_YACC= --diag_suppress 111,177
35	QMAKE_CFLAGS_THREAD= -mt	35	QMAKE_CFLAGS_THREAD= -mt
36		36
37	QMAKE_CXX = KCC	37	QMAKE_CXX = KCC
38	QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 $(CXXFLAGS_EXTRA)	38	QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 $(CXXFLAGS_EXTRA)
39	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS	39	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
40	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	40	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
41	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	41	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
42	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	42	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
43	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	43	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
44	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	44	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
45	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	45	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
46	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	46	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
47		47
48	QMAKE_INCDIR =	48	QMAKE_INCDIR =
49	QMAKE_LIBDIR =	49	QMAKE_LIBDIR =
50	QMAKE_INCDIR_X11= /usr/openwin/include	50	QMAKE_INCDIR_X11= /usr/openwin/include
51	QMAKE_LIBDIR_X11= /usr/openwin/lib	51	QMAKE_LIBDIR_X11= /usr/openwin/lib
52	QMAKE_INCDIR_QT = $(QTDIR)/include	52	QMAKE_INCDIR_QT = $(QTDIR)/include
53	QMAKE_LIBDIR_QT = $(QTDIR)/lib	53	QMAKE_LIBDIR_QT = $(QTDIR)/lib
54	QMAKE_INCDIR_OPENGL= /usr/openwin/include	54	QMAKE_INCDIR_OPENGL= /usr/openwin/include
55	QMAKE_LIBDIR_OPENGL= /usr/openwin/lib	55	QMAKE_LIBDIR_OPENGL= /usr/openwin/lib