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

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
@@ -38,49 +38,49 @@
38	# Enables strict ANSI C compliance.	38	# Enables strict ANSI C compliance.
39	# -Ae	39	# -Ae
40	# Enables ANSI C compliance, HP value-added features (as described	40	# Enables ANSI C compliance, HP value-added features (as described
41	# for +e option), and _HPUX_SOURCE name space macro. It is equivalent	41	# for +e option), and _HPUX_SOURCE name space macro. It is equivalent
42	# to -Aa +e -D_HPUX_SOURCE.	42	# to -Aa +e -D_HPUX_SOURCE.
43	# +e	43	# +e
44	# Enables the following HP value added features while compiling in	44	# Enables the following HP value added features while compiling in
45	# ANSI C mode: sized enum, long long, long pointers, compiler supplied	45	# ANSI C mode: sized enum, long long, long pointers, compiler supplied
46	# defaults for missing arguments to intrinsic calls, and $ in identifier	46	# defaults for missing arguments to intrinsic calls, and $ in identifier
47	# HP C extensions.	47	# HP C extensions.
48	#	48	#
49		49
50	MAKEFILE_GENERATOR= UNIX	50	MAKEFILE_GENERATOR= UNIX
51	TEMPLATE = app	51	TEMPLATE = app
52	CONFIG += qt warn_on release	52	CONFIG += qt warn_on release
53		53
54	QMAKE_CC = cc	54	QMAKE_CC = cc
55	QMAKE_LEX = flex	55	QMAKE_LEX = flex
56	QMAKE_LEXFLAGS =	56	QMAKE_LEXFLAGS =
57	QMAKE_YACC = yacc	57	QMAKE_YACC = yacc
58	QMAKE_YACCFLAGS = -d	58	QMAKE_YACCFLAGS = -d
59	QMAKE_CFLAGS = -Ae +DA2.0W -w $(CFLAGS_EXTRA)	59	QMAKE_CFLAGS = -Ae +DA2.0W -w $(CFLAGS_EXTRA)
60	QMAKE_CFLAGS_WARN_ON=	60	QMAKE_CFLAGS_WARN_ON=
61	QMAKE_CFLAGS_WARN_OFF=	61	QMAKE_CFLAGS_WARN_OFF=
62	QMAKE_CFLAGS_RELEASE= -O +Osize	62	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O +Osize)
63	QMAKE_CFLAGS_DEBUG= -g	63	QMAKE_CFLAGS_DEBUG= -g
64	QMAKE_CFLAGS_SHLIB= +Z	64	QMAKE_CFLAGS_SHLIB= +Z
65	QMAKE_CFLAGS_YACC=	65	QMAKE_CFLAGS_YACC=
66	QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE	66	QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
67		67
68	QMAKE_CXX = aCC	68	QMAKE_CXX = aCC
69	QMAKE_CXXFLAGS = -Aa +DA2.0W -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA)	69	QMAKE_CXXFLAGS = -Aa +DA2.0W -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA)
70	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	70	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
71	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	71	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
72	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	72	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
73	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	73	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
74	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	74	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
75	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	75	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
76	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	76	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
77		77
78	QMAKE_INCDIR =	78	QMAKE_INCDIR =
79	QMAKE_LIBDIR =	79	QMAKE_LIBDIR =
80	QMAKE_INCDIR_X11= /usr/include/X11R6	80	QMAKE_INCDIR_X11= /usr/include/X11R6
81	QMAKE_LIBDIR_X11= /usr/lib/X11R6/pa20_64	81	QMAKE_LIBDIR_X11= /usr/lib/X11R6/pa20_64
82	QMAKE_INCDIR_QT = $(QTDIR)/include	82	QMAKE_INCDIR_QT = $(QTDIR)/include
83	QMAKE_LIBDIR_QT = $(QTDIR)/lib	83	QMAKE_LIBDIR_QT = $(QTDIR)/lib
84	QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include	84	QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
85	QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64	85	QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64
86		86