[Kde-cygwin-cvs] CVS: qt-3/mkspecs/win32-msvc qmake.conf,1.1.1.15,1.1.1.16

[Christian E. <che...@us...>]

Update of /cvsroot/kde-cygwin/qt-3/mkspecs/win32-msvc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6831/mkspecs/win32-msvc

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	qmake.conf 
Log Message:
reapply patches which were lost during my not so good update to 3.3.5

Index: qmake.conf
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/win32-msvc/qmake.conf,v
retrieving revision 1.1.1.15
retrieving revision 1.1.1.16
diff -u -r1.1.1.15 -r1.1.1.16
--- qmake.conf	22 Sep 2005 12:58:57 -0000	1.1.1.15
+++ qmake.conf	30 Sep 2005 16:58:31 -0000	1.1.1.16
@@ -8,7 +8,7 @@
 
 MAKEFILE_GENERATOR	= MSVC
 TEMPLATE		= app
-CONFIG			+= qt warn_on release incremental flat link_prl precompile_header
+CONFIG			+= qt warn_on release flat link_prl precompile_header
 DEFINES			+= UNICODE
 
 exists( $(QTDIR)\.qtwinconfig ) {
@@ -20,7 +20,7 @@
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= byacc
 QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -nologo -Zm200
+QMAKE_CFLAGS		= -nologo -Zm200 -EHsc
 QMAKE_CFLAGS_WARN_ON	= -W3
 QMAKE_CFLAGS_WARN_OFF	= -W0
 QMAKE_CFLAGS_RELEASE	= -O1