kde-cygwin--cvs — List for CVS update notification

[Kde-cygwin-cvs] CVS: qt-3/qmake/generators/win32 borland_bmake.cpp,1.1.1.14,1.1.1.15

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

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

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

Index: borland_bmake.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/qmake/generators/win32/borland_bmake.cpp,v
retrieving revision 1.1.1.14
retrieving revision 1.1.1.15
diff -u -r1.1.1.14 -r1.1.1.15
--- borland_bmake.cpp	22 Sep 2005 12:57:34 -0000	1.1.1.14
+++ borland_bmake.cpp	30 Sep 2005 16:58:31 -0000	1.1.1.15
@@ -105,7 +105,7 @@
 	t << "LINK	=	" << var("QMAKE_LINK") << endl;
 	t << "LFLAGS	=	";
 	if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() )
-	    t << varGlue("QMAKE_LIBDIR","-L",";","") << " ";
+	    t << varGlue("QMAKE_LIBDIR","-L\"",";","\"") << " ";
 	t << var("QMAKE_LFLAGS") << endl;
 	t << "LIBS	=	" << var("QMAKE_LIBS") << endl;
     }
@@ -186,10 +186,14 @@
 	t << "\n\t" << "$(LINK) @&&|" << "\n\t"
 	  << "$(LFLAGS) $(OBJECTS) $(OBJMOC),$(TARGET),,$(LIBS),$(DEF_FILE),$(RES_FILE)";
     } else {
+	// tlib.exe splits every parameter at " ", "+" and "-". Fix this by
+	// quoting.
 	t << "\n\t-$(DEL_FILE) $(TARGET)"
-	  << "\n\t" << "$(LIB) $(TARGET) @&&|" << " \n+"
-	  << project->variables()["OBJECTS"].join(" \\\n+") << " \\\n+"
-	  << project->variables()["OBJMOC"].join(" \\\n+");
+	  << "\n\t" << "$(LIB) \"$(TARGET)\" @&&|" << " \n";
+	if(project->variables()["OBJECTS"].count() > 0)
+	    t << "+\"" << project->variables()["OBJECTS"].join("\" \\\n+\"") << "\" \\\n";
+	if(project->variables()["OBJMOC"].count() > 0)
+	    t << "+\"" << project->variables()["OBJMOC"].join("\" \\\n+\"") << "\" \\\n";
     }
     t << extraCompilerDeps;
     t << endl << "|" << endl;

[Kde-cygwin-cvs] CVS: qt-3/qmake Makefile.win32-g++,1.1.1.6,1.1.1.7 option.cpp,1.1.1.11,1.1.1.12 project.cpp,1.1.1.13,1.1.1.14

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

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

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	Makefile.win32-g++ option.cpp project.cpp 
Log Message:
reapply patches which were lost during my not so good update to 3.3.5

Index: Makefile.win32-g++
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/qmake/Makefile.win32-g++,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- Makefile.win32-g++	22 Sep 2005 12:57:27 -0000	1.1.1.6
+++ Makefile.win32-g++	30 Sep 2005 16:58:31 -0000	1.1.1.7
@@ -1,7 +1,7 @@
 #
 # specific stuff for mingw g++ make
 #
-CXX	    =	g++
+CXX	    =	mingw32-g++
 CFLAGS	    =	-c -o$@ -O \
 		-I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -I..\include -I..\src\tools \
 		-I..\mkspecs\win32-g++ \

Index: option.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/qmake/option.cpp,v
retrieving revision 1.1.1.11
retrieving revision 1.1.1.12
diff -u -r1.1.1.11 -r1.1.1.12
--- option.cpp	22 Sep 2005 12:57:27 -0000	1.1.1.11
+++ option.cpp	30 Sep 2005 16:58:31 -0000	1.1.1.12
@@ -499,6 +499,9 @@
 	fixEnvVariables(tmp);
     if(canonical)
 	tmp = fixPath(tmp);
+	
+	if (!tmp) tmp = "";// MSVC 8 beta  don't likes NULL strings: error in open.c 
+	
 #if defined(Q_OS_WIN32)
     return tmp.replace('/', '\\');
 #else

Index: project.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/qmake/project.cpp,v
retrieving revision 1.1.1.13
retrieving revision 1.1.1.14
diff -u -r1.1.1.13 -r1.1.1.14
--- project.cpp	22 Sep 2005 12:57:27 -0000	1.1.1.13
+++ project.cpp	30 Sep 2005 16:58:31 -0000	1.1.1.14
@@ -695,8 +695,18 @@
     if(x.isEmpty())
 	return TRUE;
 
-    if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_QNX6_MODE ||
-	Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix")
+    QRegExp re(x, FALSE, TRUE);
+    QString spec = Option::mkfile::qmakespec.right(Option::mkfile::qmakespec.length() -
+						   (Option::mkfile::qmakespec.findRev(QDir::separator())+1));
+
+    bool crossCompileWin = Option::target_mode == Option::TARG_UNIX_MODE
+    	&& spec.find("win32") == 0  ? 1 : 0;
+
+    if (crossCompileWin && Option::target_mode == Option::TARG_UNIX_MODE && x == "win32")
+	return TRUE;
+    if(!crossCompileWin && Option::target_mode == Option::TARG_UNIX_MODE && x == "unix")
+	return TRUE;
+    if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_QNX6_MODE) && x == "unix")
 	return TRUE;
     else if(Option::target_mode == Option::TARG_MACX_MODE && x == "macx")
 	return TRUE;
@@ -711,9 +721,6 @@
 	return TRUE;
 
 
-    QRegExp re(x, FALSE, TRUE);
-    QString spec = Option::mkfile::qmakespec.right(Option::mkfile::qmakespec.length() -
-						   (Option::mkfile::qmakespec.findRev(QDir::separator())+1));
     if((regex && re.exactMatch(spec)) || (!regex && spec == x))
 	return TRUE;
 #ifdef Q_OS_UNIX

[Kde-cygwin-cvs] CVS: qt-3/mkspecs/win32-borland qmake.conf,1.1.1.13,1.1.1.14

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

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

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-borland/qmake.conf,v
retrieving revision 1.1.1.13
retrieving revision 1.1.1.14
diff -u -r1.1.1.13 -r1.1.1.14
--- qmake.conf	22 Sep 2005 12:58:56 -0000	1.1.1.13
+++ qmake.conf	30 Sep 2005 16:58:31 -0000	1.1.1.14
@@ -58,8 +58,8 @@
 QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF
 
-QMAKE_INCDIR		=
-QMAKE_INCDIR_QT		= $(QTDIR)\include
+QMAKE_INCDIR		= $(QTDIR)\include $(BCB)\include
+QMAKE_INCDIR_QT		= 
 QMAKE_LIBDIR		= $(BCB)\lib
 QMAKE_LIBDIR_QT		= $(QTDIR)\lib
 

[Kde-cygwin-cvs] CVS: qt-3 qt-3-head.patch,NONE,1.1.2.1 configure,1.1.1.17,1.1.1.18 patched-original-files.txt,1.1.2.11,1.1.2.12

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

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

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	configure patched-original-files.txt 
Added Files:
      Tag: QT_WIN32_3_3_BRANCH
	qt-3-head.patch 
Log Message:
reapply patches which were lost during my not so good update to 3.3.5

--- NEW FILE: qt-3-head.patch ---
Index: configure
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/configure,v
retrieving revision 1.1.1.17
diff -u -r1.1.1.17 configure
--- configure	22 Sep 2005 12:50:48 -0000	1.1.1.17
+++ configure	30 Sep 2005 16:45:24 -0000
@@ -49,6 +49,7 @@
 PLATFORM_MAC=no
 PLATFORM_QWS=no
 PLATFORM_QNX=no
+PLATFORM_WIN=no
 
 if [ -f $relpath/src/kernel/qapplication_mac.cpp ] && [ -d /System/Library/Frameworks/Carbon.framework ]; then
     # Qt/Mac
@@ -67,9 +68,12 @@
     else
 	PLATFORM_QWS=maybe
     fi
[...1525 lines suppressed...]
 	QStringList::Iterator fit = familysubs.begin();
 	while (fit != familysubs.end()) {
 	    QStringList subs = QFont::substitutes(*fit);
-	    settings.writeEntry("/qt/Font Substitutions/" + *fit, subs);
+	    settings.writeEntry(key + "Font Substitutions/" + *fit, subs);
 	    fit++;
 	}
     }
Index: tools/qtconfig/qtconfig.pro
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/tools/qtconfig/qtconfig.pro,v
retrieving revision 1.1.1.9
diff -u -r1.1.1.9 qtconfig.pro
--- tools/qtconfig/qtconfig.pro	22 Sep 2005 12:57:57 -0000	1.1.1.9
+++ tools/qtconfig/qtconfig.pro	30 Sep 2005 16:45:28 -0000
@@ -16,3 +16,4 @@
 INCLUDEPATH	+= .
 DBFILE		 = qtconfig.db
 REQUIRES=full-config nocrosscompiler !win32*
+win32:RC_FILE	= qtconfig.rc

Index: configure
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/configure,v
retrieving revision 1.1.1.17
retrieving revision 1.1.1.18
diff -u -r1.1.1.17 -r1.1.1.18
--- configure	22 Sep 2005 12:50:48 -0000	1.1.1.17
+++ configure	30 Sep 2005 16:58:30 -0000	1.1.1.18
@@ -49,6 +49,7 @@
 PLATFORM_MAC=no
 PLATFORM_QWS=no
 PLATFORM_QNX=no
+PLATFORM_WIN=no
 
 if [ -f $relpath/src/kernel/qapplication_mac.cpp ] && [ -d /System/Library/Frameworks/Carbon.framework ]; then
     # Qt/Mac
@@ -67,9 +68,12 @@
     else
 	PLATFORM_QWS=maybe
     fi
+elif [ -f $relpath/src/kernel/qapplication_win.cpp ]; then
+    # Qt/Win
+    # ~ src/kernel/qapplication_win.cpp is present
+    PLATFORM_WIN=maybe
 fi
 
-
 #-------------------------------------------------------------------------------
 # check commercial license
 #-------------------------------------------------------------------------------
@@ -79,6 +83,7 @@
 if [ -f $relpath/LICENSE.QPL -o -f $relpath/LICENSE.GPL ]; then
     [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
     [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes
+    [ "$PLATFORM_WIN" = "maybe" ] && PLATFORM_WIN=yes
     Edition="free"
     Licensee="Free"
     Products="qt-free"
@@ -567,6 +572,9 @@
 	    UNKNOWN_OPT=yes
         fi
 	;;
+    win32)
+	    PLATFORM_WIN=yes
+	;;
     profile)
 	if [ "$VAL" = "yes" ]; then
 	    CFG_PROFILE=yes
@@ -1160,6 +1168,9 @@
     fi
 fi
 
+# setup up top level Makefile  
+cp $relpath/Makefile.unix $relpath/Makefile
+
 # if the source tree is different from the build tree,
 # symlink or copy part of the sources
 if [ "$OPT_SHADOW" = "yes" ]; then
@@ -1446,7 +1457,11 @@
 	"
 	;;
      CYGWIN*:*)
-	PLATFORM=cygwin-g++
+  if [ "$PLATFORM_WIN" = "yes" ] ; then
+		PLATFORM=cygwin-g++-win32
+	else 
+		PLATFORM=cygwin-g++
+	fi
 	;;
      LynxOS*:*)
 	PLATFORM=lynxos-g++
@@ -2336,6 +2351,14 @@
 	    echo
 	    echo "Type 'Q' to view the Q Public License."
 	    affix="either"
+	elif [ "$PLATFORM_WIN" = "yes" ]; then
+	    echo
+	    echo "This is the Qt/Win Free Edition."
+	    echo
+	    echo "You are licensed to use this software under the terms of"
+	    echo "the GNU General Public License (GPL)."
+	    echo
+	    affix="the"
 	else
 	    echo
 	    echo "Internal error."
@@ -2523,82 +2546,91 @@
 fi
 
 # build qmake
-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
-    echo "Creating qmake. Please wait..."
-    rm -f mkspecs/default
-    ln -s `echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default
-    # fix makefiles
-    for mkfile in GNUmakefile Makefile; do
-	EXTRA_LFLAGS=
-	EXTRA_CFLAGS=
-	in_mkfile="${mkfile}.in"
-	if [ "$mkfile" = "Makefile" ]; then
-#	    if which qmake >/dev/null 2>&1 && [ -f qmake/qmake.pro ]; then
-#		(cd qmake && qmake) >/dev/null 2>&1 && continue
-#	    fi
-	    in_mkfile="${mkfile}.unix"
-	fi
-	in_mkfile="$relpath/qmake/$in_mkfile"
-	mkfile="$outpath/qmake/$mkfile"
-	if [ -f "$mkfile" ]; then
-	    [ "$Edition" = "troll" ] && $WHICH chflags >/dev/null 2>&1 && chflags nouchg $mkfile
-	    rm -f $mkfile
-	fi
-	[ -f "$in_mkfile" ] || continue
-
-	echo "########################################################################" >$mkfile
-	echo "## This file was autogenerated by configure, all changes will be lost ##" >>$mkfile
-	echo "########################################################################" >>$mkfile
-	grep "QMAKE_CC[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,QMAKE_CC,CC," >>$mkfile
-	grep "QMAKE_CXX[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,QMAKE_CXX,CXX," >>$mkfile
-	if [ "$CFG_DEBUG" = "yes" ]; then
-            grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile
-	    EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)"
-        fi
-	if [ "$PLATFORM_MAC" = "yes" ]; then
-	    echo "CARBON_LFLAGS +=-framework CoreServices" >>$mkfile
-	    EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
-	    EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS) -DQT_MACOSX_VERSION=$QT_MAC_VERSION"
-	    EXTRA_SOURCES="qurl.o qsettings_mac.o"
-	elif [ "$PLATFORM" = "tru64-cxx" ]; then
-	    echo "OSF_LFLAGS = -lm"  >>$mkfile
-	    EXTRA_LFLAGS="$EXTRA_LFLAGS \$(OSF_LFLAGS)"
-        elif [ "$PLATFORM_QNX" = "yes" ]; then
-	  echo "QNX_LFLAGS += -fhonor-std -fno-builtins -pipe" >>$mkfile
-	  echo "QNX_CFLAGS += -lcpp" >>$mkfile
-	  EXTRA_LFLAGS="$EXTRA_CFLAGS \$(QNX_LFLAGS)"
-	  EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QNX_CFLAGS)"
-	fi
-	[ "$CFG_EMBEDDED" != "no" ] && EXTRA_CFLAGS="$EXTRA_CFLAGS -DQWS"
-	if [ '!' -z "$D_FLAGS" ]; then
-	    for DEF in $D_FLAGS; do
-		EXTRA_CFLAGS="$EXTRA_CFLAGS -D${DEF}"
-	    done
-        fi
-	if [ "$MIPSPRO_MINOR_VERSION" -gt "3" \
-	      -a "$IRIX_VERSION" -ge "18" -a "$IRIX_VERSION" -le "22" ]; then
-	    EXTRA_CFLAGS="$EXTRA_CFLAGS -LANG:libc_in_namespace_std=off"
-	fi
-	QMAKE_BIN_DIR="$QT_INSTALL_BINS"
-	[ -z "$QMAKE_BIN_DIR" ] && QMAKE_BIN_DIR="${QT_INSTALL_PREFIX}/bin"
-	QMAKE_DATA_DIR="$QT_INSTALL_DATA"
-	[ -z "$QMAKE_DATA_DIR" ] && QMAKE_DATA_DIR="${QT_INSTALL_PREFIX}"
-        echo >>$mkfile
-	sed -e "s,@SOURCE_PATH@,$relpath,g" -e "s,@BUILD_PATH@,$outpath,g" \
-	    -e "s,@QMAKE_CFLAGS@,$EXTRA_CFLAGS,g" -e "s,@QMAKE_LFLAGS@,$EXTRA_LFLAGS,g" \
-	    -e "s,@QT_INSTALL_BINS@,\$(INSTALL_ROOT)$QMAKE_BIN_DIR,g" \
-	    -e "s,@QT_INSTALL_DATA@,\$(INSTALL_ROOT)$QMAKE_DATA_DIR,g" \
-	    -e "s,@QMAKE_QTOBJS@,$EXTRA_SOURCES,g" -e "s,@QMAKESPEC@,$QMAKESPEC,g" $in_mkfile >>$mkfile
-
-	if [ "$Edition" = "troll" ] &&
-	    $WHICH makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then
-	    (cd $outpath/qmake && $MAKE -f $mkfile depend) >/dev/null 2>&1
-	fi
-    done
-
-    (cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting." && exit 2)) || exit 2
-fi
+case $UNAME_SYSTEM:$PLATFORM in
+	Linux:win32*)
+		# cross compile 
+		echo "...updating qmake Makefile"
+		(cd $outpath/qmake && qmake -spec ${relpath}/mkspecs/$PLATFORM) # >/dev/null 2>&1 && continue
+		(cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting." && exit 2)) || exit 2
+		;;
+	*)
+		if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+		echo "Creating qmake. Please wait..."
+		rm -f mkspecs/default
+		ln -s `echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default
+		# fix makefiles
+		for mkfile in GNUmakefile Makefile; do
+			EXTRA_LFLAGS=
+			EXTRA_CFLAGS=
+			in_mkfile="${mkfile}.in"
+			if [ "$mkfile" = "Makefile" ]; then
+		#	    if which qmake >/dev/null 2>&1 && [ -f qmake/qmake.pro ]; then
+		#		(cd qmake && qmake) >/dev/null 2>&1 && continue
+		#	    fi
+			in_mkfile="${mkfile}.unix"
+			fi
+			in_mkfile="$relpath/qmake/$in_mkfile"
+			mkfile="$outpath/qmake/$mkfile"
+			if [ -f "$mkfile" ]; then
+			[ "$Edition" = "troll" ] && $WHICH chflags >/dev/null 2>&1 && chflags nouchg $mkfile
+			rm -f $mkfile
+			fi
+			[ -f "$in_mkfile" ] || continue
+
+			echo "########################################################################" >$mkfile
+			echo "## This file was autogenerated by configure, all changes will be lost ##" >>$mkfile
+			echo "########################################################################" >>$mkfile
+			grep "QMAKE_CC[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,QMAKE_CC,CC," >>$mkfile
+			grep "QMAKE_CXX[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,QMAKE_CXX,CXX," >>$mkfile
+			if [ "$CFG_DEBUG" = "yes" ]; then
+			grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile
+			EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)"
+			fi
+			if [ "$PLATFORM_MAC" = "yes" ]; then
+			echo "CARBON_LFLAGS +=-framework CoreServices" >>$mkfile
+			EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
+			EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS) -DQT_MACOSX_VERSION=$QT_MAC_VERSION"
+			EXTRA_SOURCES="qurl.o qsettings_mac.o"
+			elif [ "$PLATFORM" = "tru64-cxx" ]; then
+			echo "OSF_LFLAGS = -lm"  >>$mkfile
+			EXTRA_LFLAGS="$EXTRA_LFLAGS \$(OSF_LFLAGS)"
+			elif [ "$PLATFORM_QNX" = "yes" ]; then
+			echo "QNX_LFLAGS += -fhonor-std -fno-builtins -pipe" >>$mkfile
+			echo "QNX_CFLAGS += -lcpp" >>$mkfile
+			EXTRA_LFLAGS="$EXTRA_CFLAGS \$(QNX_LFLAGS)"
+			EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QNX_CFLAGS)"
+			fi
+			[ "$CFG_EMBEDDED" != "no" ] && EXTRA_CFLAGS="$EXTRA_CFLAGS -DQWS"
+			if [ '!' -z "$D_FLAGS" ]; then
+			for DEF in $D_FLAGS; do
+				EXTRA_CFLAGS="$EXTRA_CFLAGS -D${DEF}"
+			done
+			fi
+			if [ "$MIPSPRO_MINOR_VERSION" -gt "3" \
+			-a "$IRIX_VERSION" -ge "18" -a "$IRIX_VERSION" -le "22" ]; then
+			EXTRA_CFLAGS="$EXTRA_CFLAGS -LANG:libc_in_namespace_std=off"
+			fi
+			QMAKE_BIN_DIR="$QT_INSTALL_BINS"
+			[ -z "$QMAKE_BIN_DIR" ] && QMAKE_BIN_DIR="${QT_INSTALL_PREFIX}/bin"
+			QMAKE_DATA_DIR="$QT_INSTALL_DATA"
+			[ -z "$QMAKE_DATA_DIR" ] && QMAKE_DATA_DIR="${QT_INSTALL_PREFIX}"
+			echo >>$mkfile
+			sed -e "s,@SOURCE_PATH@,$relpath,g" -e "s,@BUILD_PATH@,$outpath,g" \
+			-e "s,@QMAKE_CFLAGS@,$EXTRA_CFLAGS,g" -e "s,@QMAKE_LFLAGS@,$EXTRA_LFLAGS,g" \
+			-e "s,@QT_INSTALL_BINS@,\$(INSTALL_ROOT)$QMAKE_BIN_DIR,g" \
+			-e "s,@QT_INSTALL_DATA@,\$(INSTALL_ROOT)$QMAKE_DATA_DIR,g" \
+			-e "s,@QMAKE_QTOBJS@,$EXTRA_SOURCES,g" -e "s,@QMAKESPEC@,$QMAKESPEC,g" $in_mkfile >>$mkfile
+
+			if [ "$Edition" = "troll" ] &&
+			$WHICH makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then
+			(cd $outpath/qmake && $MAKE -f $mkfile depend) >/dev/null 2>&1
+			fi
+		done
 
+		(cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting." && exit 2)) || exit 2
+		fi
+		;;
+esac
 # clean up temporary qconfig.h and qmodules.h
 rm -f $outpath/include/qmake/qconfig.h
 rm -f $outpath/include/qmake/qmodules.h

Index: patched-original-files.txt
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/Attic/patched-original-files.txt,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- patched-original-files.txt	24 Apr 2005 12:34:18 -0000	1.1.2.11
+++ patched-original-files.txt	30 Sep 2005 16:58:30 -0000	1.1.2.12
@@ -10,6 +10,8 @@
 2. you must document and explain your changes in this file
 3. and you should add the diff against the original file (mail from the kde-cygwin--cvs list).
 
+Because some of the changes made aren't here, please see qt-3-head.patch for all changes.
+I'll try to update this file asap.
 
 
 Version 3.3.3 changes 
@@ -60,8 +62,8 @@
 RCS file: /cvsroot/kde-cygwin/qt-3/qmake/generators/win32/borland_bmake.cpp,v
 retrieving revision 1.1.1.10
 diff -u -r1.1.1.10 borland_bmake.cpp
---- qmake/generators/win32/borland_bmake.cpp	29 Jan 2005 11:12:56 -0000	1.1.1.10
-+++ qmake/generators/win32/borland_bmake.cpp	30 Jan 2005 18:26:24 -0000
+--- qmake/generators/win32/borland_bmake.cpp	22 Sep 2005 12:57:34 -0000	1.1.1.14
++++ qmake/generators/win32/borland_bmake.cpp	30 Sep 2005 16:45:24 -0000
 @@ -105,7 +105,7 @@
  	t << "LINK	=	" << var("QMAKE_LINK") << endl;
  	t << "LFLAGS	=	";
@@ -163,6 +165,7 @@
  
  x11:SUBDIRS	+= biff \
 _________________________________________________________________________________________________________________________
+
 * src/kernel/qprocess.cpp
 _________________________________________________________________________________________________________________________
 
@@ -389,18 +392,39 @@
 RCS file: /cvsroot/kde-cygwin/qt-3/src/dialogs/qfiledialog.cpp,v
 retrieving revision 1.1.1.13
 diff -u -3 -p -B -r1.1.1.13 qfiledialog.cpp
---- src/dialogs/qfiledialog.cpp	12 Feb 2005 00:17:10 -0000	1.1.1.13
-+++ src/dialogs/qfiledialog.cpp	15 Feb 2005 22:42:04 -0000
-@@ -5684,6 +5684,9 @@ static bool isRoot( const QUrl &u )
+--- src/dialogs/qfiledialog.cpp	22 Sep 2005 12:53:56 -0000	1.1.1.21
++++ src/dialogs/qfiledialog.cpp	30 Sep 2005 16:45:24 -0000
+@@ -113,6 +113,20 @@
+ #undef check
+ #endif
  
-     return FALSE;
++#if defined(Q_OS_CYGWIN) && defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
++int getlogin_r (char* name, size_t namesize )
++{
++	char *s = getlogin(); 
++	if (s) {
++	 	strncpy (name, s, namesize);
++		return 0; 
++	}	
++	else {
++		return -1;
++	}
++}
++#endif 
++
+ /* XPM */
+ static const char * const start_xpm[]={
+     "16 15 8 1",
+@@ -5708,6 +5722,9 @@
+ {
+     return d->url;
  }
 +#if defined(Q_CYGWIN_WIN)
 +Q_EXPORT int qt_ntfs_permission_lookup = 0;
 +#endif 
  
- #if defined(Q_WS_WIN)
- extern int qt_ntfs_permission_lookup;
+ static bool isRoot( const QUrl &u )
+ {
 Index: kernel/qapplication.cpp
 ===================================================================
 RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qapplication.cpp,v
@@ -417,38 +441,19 @@
  #include "qapplication_p.h"
  
  Qt::WindowsVersion QApplication::winVersion()
-Index: kernel/qapplication_win.cpp
-===================================================================
-RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/Attic/qapplication_win.cpp,v
-retrieving revision 1.1.2.30.2.41
-diff -u -3 -p -B -r1.1.2.30.2.41 qapplication_win.cpp
---- src/kernel/qapplication_win.cpp	21 Jan 2005 11:14:51 -0000	1.1.2.30.2.41
-+++ src/kernel/qapplication_win.cpp	15 Feb 2005 22:42:33 -0000
-@@ -1494,9 +1494,10 @@ static void qt_init_internal( int *argcp
-     }
-     /* we can't call something like qt_init_dir() in qdir_win.cpp since link_includes and
-        configure.exe will fail linking because of missing qAddPostRoutine */
-+#if !defined(Q_CYGWIN_WIN)
-     extern void qt_dir_cleanup();
-     qAddPostRoutine( qt_dir_cleanup );
--
-+#endif 
-     //
-     // application style settings
-     //
 Index: kernel/qclipboard.cpp
 ===================================================================
 RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qclipboard.cpp,v
 retrieving revision 1.1.1.9
 diff -u -3 -p -B -r1.1.1.9 qclipboard.cpp
---- src/kernel/qclipboard.cpp	29 Jan 2005 11:13:03 -0000	1.1.1.9
-+++ src/kernel/qclipboard.cpp	15 Feb 2005 22:42:33 -0000
-@@ -154,7 +154,7 @@ QClipboard::QClipboard( QObject *parent,
+--- src/kernel/qclipboard.cpp	22 Sep 2005 12:55:16 -0000	1.1.1.13
++++ src/kernel/qclipboard.cpp	30 Sep 2005 16:45:26 -0000
+@@ -154,7 +154,7 @@
      // nothing
  }
  
 -#ifndef Q_WS_WIN32
-+#ifndef Q_WS_WIN
++#if !defined(Q_WS_WIN)
  /*!
      \internal
  
@@ -477,27 +482,6 @@
      // pending socket notifiers list
      QPtrList<QSockNot> sn_pending_list;
  #endif // Q_WS_WIN
-Index: kernel/qprinter_win.cpp
-===================================================================
-RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/Attic/qprinter_win.cpp,v
-retrieving revision 1.1.2.6.2.17
-diff -u -3 -p -B -r1.1.2.6.2.17 qprinter_win.cpp
---- src/kernel/qprinter_win.cpp	20 Jan 2005 15:35:30 -0000	1.1.2.6.2.17
-+++ src/kernel/qprinter_win.cpp	15 Feb 2005 22:42:46 -0000
-@@ -639,8 +639,13 @@ bool QPrinter::cmd( int c, QPainter *pai
-         DOCINFO di;
-         di.cbSize = sizeof( DOCINFO );
-         di.lpszDatatype = 0;
-+#ifdef Q_CYGWIN_WIN
-+        di.lpszDocName = doc_name.latin1();
-+        di.lpszOutput = output_filename.latin1();
-+#else 
-         di.lpszDocName = ( WCHAR * ) doc_name.ucs2();
-         di.lpszOutput = ( WCHAR * )output_filename.ucs2();
-+#endif         	
-         state = PST_ACTIVE;
-         if ( StartDoc( hdc, &di ) == SP_ERROR ) {
-             state = PST_ERROR;
 Index: kernel/qt_kernel.pri
 ===================================================================
 RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qt_kernel.pri,v
@@ -540,38 +524,6 @@
  	unix:SOURCES += $$KERNEL_CPP/qprocess_unix.cpp \
  		        $$KERNEL_CPP/qthread_unix.cpp
  
-Index: kernel/qt_windows.h
-===================================================================
-RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qt_windows.h,v
-retrieving revision 1.2.2.10
-diff -u -3 -p -B -r1.2.2.10 qt_windows.h
---- src/kernel/qt_windows.h	17 Dec 2004 09:17:10 -0000	1.2.2.10
-+++ src/kernel/qt_windows.h	15 Feb 2005 22:42:56 -0000
-@@ -28,6 +28,24 @@
- 
- #include <windows.h>
- 
-+#ifdef Q_CYGWIN_WIN
-+#define WSAGETSELECTEVENT(l)	LOWORD(l)
-+#define FD_READ_BIT      0
-+#define FD_READ          (1 << FD_READ_BIT)
-+#define FD_WRITE_BIT     1
-+#define FD_WRITE         (1 << FD_WRITE_BIT)
-+#define FD_OOB_BIT       2
-+#define FD_OOB           (1 << FD_OOB_BIT)
-+#define FD_ACCEPT_BIT    3
-+#define FD_ACCEPT        (1 << FD_ACCEPT_BIT)
-+#define FD_CONNECT_BIT   4
-+#define FD_CONNECT       (1 << FD_CONNECT_BIT)
-+#define FD_CLOSE_BIT     5
-+#define FD_CLOSE         (1 << FD_CLOSE_BIT)
-+typedef unsigned int	SOCKET;
-+extern "C" int PASCAL WSAAsyncSelect(SOCKET,HWND,unsigned int,long);
-+#endif 
-+
- #include "qnamespace.h"
- 
- #ifndef QT_SOCKLEN_T
 Index: network/qt_network.pri
 ===================================================================
 RCS file: /cvsroot/kde-cygwin/qt-3/src/network/qt_network.pri,v

[Kde-cygwin-cvs] CVS: qt-3/mkspecs/cygwin-g++ qmake.conf,1.1.1.14,1.1.1.15 qplatformdefs.h,1.1.1.9,1.1.1.10

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

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

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	qmake.conf qplatformdefs.h 
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/cygwin-g++/qmake.conf,v
retrieving revision 1.1.1.14
retrieving revision 1.1.1.15
diff -u -r1.1.1.14 -r1.1.1.15
--- qmake.conf	22 Sep 2005 12:58:56 -0000	1.1.1.14
+++ qmake.conf	30 Sep 2005 16:58:30 -0000	1.1.1.15
@@ -16,12 +16,13 @@
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= byacc
 QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -pipe
+QMAKE_CFLAGS		= -pipe -fdata-sections 
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
 QMAKE_CFLAGS_RELEASE	= -O2
-QMAKE_CFLAGS_DEBUG	= -g
+QMAKE_CFLAGS_DEBUG	= -g #-pg -DQT_NO_INLINE_GLOBALSTRUT
+#add -pg -DQT_NO_INLINE_GLOBALSTRUT to activate profiling, required because -pg disables inline code 
 QMAKE_CFLAGS_SHLIB	=
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
@@ -48,19 +49,20 @@
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
-QMAKE_LFLAGS		=
-QMAKE_LFLAGS_RELEASE	=
-QMAKE_LFLAGS_DEBUG	=
+QMAKE_LFLAGS		= -Wl,--enable-runtime-pseudo-reloc -Wl,--script,$(QTDIR)/mkspecs/cygwin-g++/i386pe.x-no-rdata
+QMAKE_LFLAGS_RELEASE	= -s
+QMAKE_LFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG	
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME	= -Wl,-soname,
+QMAKE_LFLAGS_SONAME	= 
 QMAKE_LFLAGS_THREAD	=
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_RPATH		= 
+
 QMAKE_CYGWIN_SHLIB	= 1
 QMAKE_CYGWIN_EXE	= 1
  
 QMAKE_LIBS		=
-QMAKE_LIBS_DYNLOAD	= -ldl
+QMAKE_LIBS_DYNLOAD	= 
 QMAKE_LIBS_X11		= -lXext -lX11
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt

Index: qplatformdefs.h
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/cygwin-g++/qplatformdefs.h,v
retrieving revision 1.1.1.9
retrieving revision 1.1.1.10
diff -u -r1.1.1.9 -r1.1.1.10
--- qplatformdefs.h	22 Sep 2005 12:58:56 -0000	1.1.1.9
+++ qplatformdefs.h	30 Sep 2005 16:58:30 -0000	1.1.1.10
@@ -49,7 +49,7 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include <windows.h>
+//#include <windows.h>
 
 // Resolver functions are not implemented in Cygwin, headers
 // <arpa/nameser.h> and <resolv.h> are missing:

[Kde-cygwin-cvs] CVS: qt-3/src/network qdns.cpp,1.1.1.16,1.1.1.17 qt_network.pri,1.1.1.10,1.1.1.11

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

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

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	qdns.cpp qt_network.pri 
Log Message:
reapply patches which were lost during my not so good update to 3.3.5

Index: qdns.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/network/qdns.cpp,v
retrieving revision 1.1.1.16
retrieving revision 1.1.1.17
diff -u -r1.1.1.16 -r1.1.1.17
--- qdns.cpp	22 Sep 2005 12:54:52 -0000	1.1.1.16
+++ qdns.cpp	30 Sep 2005 16:58:31 -0000	1.1.1.17
@@ -79,6 +79,12 @@
 #include "../3rdparty/dlcompat/dlfcn.h"
 #endif
 
+#if defined(Q_OS_CYGWIN)
+#undef Q_OS_UNIX
+#define QT_WA( uni, ansi ) ansi
+#endif 
+
+
 //#define QDNS_DEBUG
 
 static Q_UINT16 id; // ### seeded started by now()
@@ -2276,6 +2282,10 @@
 
 #if defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN)
 
+#if defined(Q_OS_CYGWIN)
+#include <qt_windows.h>
+#endif 
+
 #if defined(Q_DNS_SYNCHRONOUS)
 void QDns::doSynchronousLookup()
 {

Index: qt_network.pri
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/network/qt_network.pri,v
retrieving revision 1.1.1.10
retrieving revision 1.1.1.11
diff -u -r1.1.1.10 -r1.1.1.11
--- qt_network.pri	22 Sep 2005 12:54:53 -0000	1.1.1.10
+++ qt_network.pri	30 Sep 2005 16:58:31 -0000	1.1.1.11
@@ -1,4 +1,5 @@
 # Qt network module
+cygwin-g++:DEFINES+= QT_NO_IPV6
 
 network {
 	HEADERS += $$NETWORK_H/qdns.h \
@@ -18,6 +19,6 @@
 		    $$NETWORK_CPP/qsocket.cpp \
 		    $$NETWORK_CPP/qsocketdevice.cpp
 	unix:NETWORK_SOURCES += $$NETWORK_CPP/qsocketdevice_unix.cpp
-	win32:NETWORK_SOURCES += $$NETWORK_CPP/qsocketdevice_win.cpp
+	win32:!unix:NETWORK_SOURCES += $$NETWORK_CPP/qsocketdevice_win.cpp
 	SOURCES    += $$NETWORK_SOURCES
 }

[Kde-cygwin-cvs] CVS: qt-3/tools/qtconfig mainwindow.cpp,1.1.1.14,1.1.1.15 qtconfig.pro,1.1.1.9,1.1.1.10

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

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

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	mainwindow.cpp qtconfig.pro 
Log Message:
reapply patches which were lost during my not so good update to 3.3.5

Index: mainwindow.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/tools/qtconfig/mainwindow.cpp,v
retrieving revision 1.1.1.14
retrieving revision 1.1.1.15
diff -u -r1.1.1.14 -r1.1.1.15
--- mainwindow.cpp	22 Sep 2005 12:57:57 -0000	1.1.1.14
+++ mainwindow.cpp	30 Sep 2005 16:58:32 -0000	1.1.1.15
@@ -40,9 +40,16 @@
 #include <qmessagebox.h>
 #include <qtextview.h>
 #include <qstyle.h>
+#include <qtabwidget.h>
+#include <qgroupbox.h>
 
 #include <stdlib.h>
 
+inline QString getVersionString()
+{
+    return QString::number( (QT_VERSION >> 16) & 0xff )
+	+ "." + QString::number( (QT_VERSION >> 8) & 0xff );
+}
 
 // from qapplication.cpp and qapplication_x11.cpp - These are NOT for
 // external use ignore them
@@ -53,15 +60,21 @@
 "<p><b><font size+=2>Appearance</font></b></p>"
 "<hr>"
 "<p>Use this tab to customize the appearance of your Qt applications.</p>"
+#ifdef Q_WS_WIN 
+"<p>You can select the default GUI Style from the drop down list.</p>"
+#else
 "<p>You can select the default GUI Style from the drop down list and "
 "customize the colors.</p>"
+#endif 
 "<p>Any GUI Style plugins in your plugin path will automatically be added "
 "to the list of built-in Qt styles. (See the Library Paths tab for "
 "information on adding new plugin paths.)</p>"
+#ifndef Q_WS_WIN 
 "<p>When you choose 3-D Effects and Background colors, the Qt Configuration "
 "program will automatically generate a palette for you.  To customize "
 "colors further, press the Tune Palette button to open the advanced "
 "palette editor."
+#endif 
 "<p>The Preview Window shows what the selected Style and colors look "
 "like.";
 
@@ -203,12 +216,26 @@
 {
     modified = TRUE;
 
+#ifdef Q_WS_WIN
+    groupAutoPalette->hide();
+    TabWidget3->removePage(tab_2); 
+    TabWidget3->removePage(tab_3); 
+//    TabWidget3->removePage(tab_4); 
+    TabWidget3->removePage(tab_5); 
+#endif 
+
     QStringList gstyles = QStyleFactory::keys();
     gstyles.sort();
     gstylecombo->insertStringList(gstyles);
 
     QSettings settings;
-    QString currentstyle = settings.readEntry("/qt/style");
+#ifdef Q_WS_WIN
+    settings.insertSearchPath( QSettings::Windows, "/Trolltech" );
+    const QString key = "/" + getVersionString() + "/";
+#else
+    const QString key = "/qt/";
+#endif 
+    QString currentstyle = settings.readEntry( key + "style" );
     if (currentstyle.isNull())
 	currentstyle = QApplication::style().className();
     {
@@ -359,17 +386,17 @@
     sublistbox->clear();
     sublistbox->insertStringList(subs);
 
-    rtlExtensions->setChecked( settings.readBoolEntry( "/qt/useRtlExtensions", FALSE ) );
+    rtlExtensions->setChecked( settings.readBoolEntry( key + "useRtlExtensions", FALSE ) );
 
 #ifdef Q_WS_X11
-    inputStyle->setCurrentText( settings.readEntry( "/qt/XIMInputStyle", trUtf8( "On The Spot" ) ) );
+    inputStyle->setCurrentText( settings.readEntry( key + "XIMInputStyle", trUtf8( "On The Spot" ) ) );
 #else
     inputStyle->hide();
     inputStyleLabel->hide();
 #endif
 
-    fontembeddingcheckbox->setChecked( settings.readBoolEntry("/qt/embedFonts", TRUE) );
-    fontpaths = settings.readListEntry("/qt/fontPath", ':');
+    fontembeddingcheckbox->setChecked( settings.readBoolEntry(key + "embedFonts", TRUE) );
+    fontpaths = settings.readListEntry(key + "fontPath", ':');
     fontpathlistbox->insertStringList(fontpaths);
 
     setModified(FALSE);
@@ -392,6 +419,15 @@
 
     {
 	QSettings settings;
+#ifdef Q_WS_WIN
+	settings.insertSearchPath( QSettings::Windows, "/Trolltech" );
+	const QString key = "/" + getVersionString() + "/";
+	const QString key_version = key;
+#else
+	const QString key = "/qt/";
+	const QString key_version = QString( key + getVersionString() );
+#endif 
+
 	QFontDatabase db;
 	QFont font = db.font(familycombo->currentText(),
 			     stylecombo->currentText(),
@@ -409,30 +445,29 @@
 	    discg << editPalette.color(QPalette::Disabled,
 				       (QColorGroup::ColorRole) i).name();
 
-	settings.writeEntry("/qt/font", font.toString());
-	settings.writeEntry("/qt/Palette/active", actcg);
-	settings.writeEntry("/qt/Palette/inactive", inactcg);
-	settings.writeEntry("/qt/Palette/disabled", discg);
+	settings.writeEntry(key + "font", font.toString());
+	settings.writeEntry(key + "Palette/active", actcg);
+	settings.writeEntry(key + "Palette/inactive", inactcg);
+	settings.writeEntry(key + "Palette/disabled", discg);
 
 	QStringList libpath = QApplication::libraryPaths();
-	QString libpathkey =
-	    QString("/qt/%1.%2/libraryPath").arg( QT_VERSION >> 16 ).arg( (QT_VERSION & 0xff00 ) >> 8 );
+	QString libpathkey =  QString(key_version + "libraryPath");
 	settings.writeEntry(libpathkey, libpath, ':');
-	settings.writeEntry("/qt/fontPath", fontpaths, ':');
-	settings.writeEntry("/qt/embedFonts", fontembeddingcheckbox->isChecked() );
-	settings.writeEntry("/qt/style", gstylecombo->currentText());
-	settings.writeEntry("/qt/doubleClickInterval",
+	settings.writeEntry(key + "fontPath", fontpaths, ':');
+	settings.writeEntry(key + "embedFonts", fontembeddingcheckbox->isChecked() );
+	settings.writeEntry(key + "style", gstylecombo->currentText());
+	settings.writeEntry(key + "doubleClickInterval",
 					     dcispin->value());
-	settings.writeEntry("/qt/cursorFlashTime", cfispin->value() == 9 ? 0 : cfispin->value() );
-	settings.writeEntry("/qt/wheelScrollLines", wslspin->value());
-	settings.writeEntry("/qt/resolveSymlinks", resolvelinks->isChecked());
+	settings.writeEntry(key + "cursorFlashTime", cfispin->value() == 9 ? 0 : cfispin->value() );
+	settings.writeEntry(key + "wheelScrollLines", wslspin->value());
+	settings.writeEntry(key + "resolveSymlinks", resolvelinks->isChecked());
 
 	QStringList strut;
 	strut << QString::number(strutwidth->value());
 	strut << QString::number(strutheight->value());
-	settings.writeEntry("/qt/globalStrut", strut);
+	settings.writeEntry(key + "globalStrut", strut);
 
-	settings.writeEntry("/qt/useRtlExtensions", rtlExtensions->isChecked() );
+	settings.writeEntry(key + "useRtlExtensions", rtlExtensions->isChecked() );
 
 #ifdef Q_WS_X11
 	QString style = inputStyle->currentText();
@@ -443,7 +478,7 @@
 	    str = "Off The Spot";
 	else if ( style == trUtf8( "Root" ) )
 	    str = "Root";
-        settings.writeEntry( "/qt/XIMInputStyle", inputStyle->currentText() );
+        settings.writeEntry( key + "XIMInputStyle", inputStyle->currentText() );
 #endif
 
 	QStringList effects;
@@ -469,13 +504,13 @@
 	    }
 	} else
 	    effects << "none";
-	settings.writeEntry("/qt/GUIEffects", effects);
+	settings.writeEntry(key + "GUIEffects", effects);
 
 	QStringList familysubs = QFont::substitutions();
 	QStringList::Iterator fit = familysubs.begin();
 	while (fit != familysubs.end()) {
 	    QStringList subs = QFont::substitutes(*fit);
-	    settings.writeEntry("/qt/Font Substitutions/" + *fit, subs);
+	    settings.writeEntry(key + "Font Substitutions/" + *fit, subs);
 	    fit++;
 	}
     }

Index: qtconfig.pro
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/tools/qtconfig/qtconfig.pro,v
retrieving revision 1.1.1.9
retrieving revision 1.1.1.10
diff -u -r1.1.1.9 -r1.1.1.10
--- qtconfig.pro	22 Sep 2005 12:57:57 -0000	1.1.1.9
+++ qtconfig.pro	30 Sep 2005 16:58:32 -0000	1.1.1.10
@@ -16,3 +16,4 @@
 INCLUDEPATH	+= .
 DBFILE		 = qtconfig.db
 REQUIRES=full-config nocrosscompiler !win32*
+win32:RC_FILE	= qtconfig.rc

[Kde-cygwin-cvs] CVS: qt-3/mkspecs/win32-msvc.net qmake.conf,1.1.1.13,1.1.1.14

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

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

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	qmake.conf 
Log Message:


Index: qmake.conf
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/win32-msvc.net/qmake.conf,v
retrieving revision 1.1.1.13
retrieving revision 1.1.1.14
diff -u -r1.1.1.13 -r1.1.1.14
--- qmake.conf	30 Sep 2005 16:58:31 -0000	1.1.1.13
+++ qmake.conf	30 Sep 2005 17:23:04 -0000	1.1.1.14
@@ -20,7 +20,7 @@
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= byacc
 QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -nologo -Zm200 -EHsc
+QMAKE_CFLAGS		= -nologo -Zm200
 QMAKE_CFLAGS_WARN_ON	= -W3
 QMAKE_CFLAGS_WARN_OFF	= -W0
 QMAKE_CFLAGS_RELEASE	= -O1

[Kde-cygwin-cvs] CVS: qt-3/src/tools qglobal.h,1.1.1.17,1.1.1.18 qgpluginmanager.cpp,1.1.1.13,1.1.1.14 qlibrary.cpp,1.1.1.16,1.1.1.17 qlibrary_p.h,1.1.1.11,1.1.1.12 qlocale.cpp,1.1.1.10,1.1.1.11 qmemarray.h,1.1.1.11,1.1.1.12 qsettings.cpp,1.1.1.15,1.1.1.16 qsettings_p.h,1.1.1.12,1.1.1.13 qstring.cpp,1.1.1.16,1.1.1.17 qstring.h,1.1.1.18,1.1.1.19 qt_tools.pri,1.1.1.8,1.1.1.9

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

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

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	qglobal.h qgpluginmanager.cpp qlibrary.cpp qlibrary_p.h 
	qlocale.cpp qmemarray.h qsettings.cpp qsettings_p.h 
	qstring.cpp qstring.h qt_tools.pri 
Log Message:
reapply patches which were lost during my not so good update to 3.3.5

Index: qglobal.h
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qglobal.h,v
retrieving revision 1.1.1.17
retrieving revision 1.1.1.18
diff -u -r1.1.1.17 -r1.1.1.18
--- qglobal.h	22 Sep 2005 12:54:07 -0000	1.1.1.17
+++ qglobal.h	30 Sep 2005 16:58:32 -0000	1.1.1.18
@@ -564,6 +564,8 @@
 #    define QT_NO_QWS_IM
 #  elif defined(Q_OS_MACX)
 #    define Q_WS_MACX
+#  elif defined(Q_CYGWIN_WIN)
+#    define Q_WS_WIN
 #  else
 #    define Q_WS_X11
 #  endif

Index: qgpluginmanager.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qgpluginmanager.cpp,v
retrieving revision 1.1.1.13
retrieving revision 1.1.1.14
diff -u -r1.1.1.13 -r1.1.1.14
--- qgpluginmanager.cpp	22 Sep 2005 12:54:08 -0000	1.1.1.13
+++ qgpluginmanager.cpp	30 Sep 2005 16:58:32 -0000	1.1.1.14
@@ -314,7 +314,7 @@
     if ( !enabled() || !QDir( path ).exists( ".", TRUE ) )
 	return;
 
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN)
     QString filter = "*.dll";
 #elif defined(Q_OS_MACX)
     QString filter = "*.dylib; *.so; *.bundle";

Index: qlibrary.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qlibrary.cpp,v
retrieving revision 1.1.1.16
retrieving revision 1.1.1.17
diff -u -r1.1.1.16 -r1.1.1.17
--- qlibrary.cpp	22 Sep 2005 12:54:04 -0000	1.1.1.16
+++ qlibrary.cpp	30 Sep 2005 16:58:32 -0000	1.1.1.17
@@ -406,6 +406,8 @@
     filters << ".dylib"; //the last one is also the default one..
 #elif defined(Q_OS_HPUX)
     filters << ".sl";
+#elif defined(Q_OS_CYGWIN)
+    filters << ".dll";
 #else
     filters << ".so";
 #endif

Index: qlibrary_p.h
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qlibrary_p.h,v
retrieving revision 1.1.1.11
retrieving revision 1.1.1.12
diff -u -r1.1.1.11 -r1.1.1.12
--- qlibrary_p.h	22 Sep 2005 12:54:04 -0000	1.1.1.11
+++ qlibrary_p.h	30 Sep 2005 16:58:32 -0000	1.1.1.12
@@ -63,7 +63,7 @@
 public:
     QLibraryPrivate( QLibrary *lib );
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
     HINSTANCE pHnd;
 #else
     void *pHnd;

Index: qlocale.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/Attic/qlocale.cpp,v
retrieving revision 1.1.1.10
retrieving revision 1.1.1.11
diff -u -r1.1.1.10 -r1.1.1.11
--- qlocale.cpp	22 Sep 2005 12:54:16 -0000	1.1.1.10
+++ qlocale.cpp	30 Sep 2005 16:58:32 -0000	1.1.1.11
@@ -43,6 +43,7 @@
 #include "qlocale.h"
 #include "qlocale_p.h"
 #include "qnamespace.h"
+#include "qplatformdefs.h"
 
 #ifdef QT_QLOCALE_USES_FCVT
 # include <qmutex.h>
@@ -1676,7 +1677,7 @@
     return QString::fromLatin1("nan");
 }
 
-#if defined(Q_OS_WIN)
+#if defined(Q_WS_WIN)
 /* Win95 doesn't have a function to return the ISO lang/country name of the user's locale.
    Instead it can return a "Windows code". This maps windows codes to ISO country names. */
 

Index: qmemarray.h
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qmemarray.h,v
retrieving revision 1.1.1.11
retrieving revision 1.1.1.12
diff -u -r1.1.1.11 -r1.1.1.12
--- qmemarray.h	22 Sep 2005 12:54:08 -0000	1.1.1.11
+++ qmemarray.h	30 Sep 2005 16:58:32 -0000	1.1.1.12
@@ -96,6 +96,8 @@
     int  bsearch( const type &d ) const
 	{ return QGArray::bsearch((const char*)&d,sizeof(type)); }
     // ### Qt 4.0: maybe provide uint overload as work-around for MSVC bug
+    type& operator[]( uint i ) const
+	{ return (type &)(*(type *)QGArray::at(i*sizeof(type))); }
     type& operator[]( int i ) const
 	{ return (type &)(*(type *)QGArray::at(i*sizeof(type))); }
     type& at( uint i ) const

Index: qsettings.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qsettings.cpp,v
retrieving revision 1.1.1.15
retrieving revision 1.1.1.16
diff -u -r1.1.1.15 -r1.1.1.16
--- qsettings.cpp	22 Sep 2005 12:54:04 -0000	1.1.1.15
+++ qsettings.cpp	30 Sep 2005 16:58:32 -0000	1.1.1.16
@@ -253,6 +253,7 @@
 */
 
 #if defined(Q_OS_UNIX)
+#define HANDLE QHANDLE
 typedef int HANDLE;
 #define Q_LOCKREAD F_RDLCK
 #define Q_LOCKWRITE F_WRLCK

Index: qsettings_p.h
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qsettings_p.h,v
retrieving revision 1.1.1.12
retrieving revision 1.1.1.13
diff -u -r1.1.1.12 -r1.1.1.13
--- qsettings_p.h	22 Sep 2005 12:54:04 -0000	1.1.1.12
+++ qsettings_p.h	30 Sep 2005 16:58:32 -0000	1.1.1.13
@@ -113,20 +113,22 @@
     void	sysInit();
     void	sysClear();
 
+/* obsolete functions since already handled in public class
+   QStringList sysReadListEntry( const QString &, bool * = 0 ) const;
+   QStringList sysReadListEntry( const QString &, const QChar& sep, bool * = 0 ) const;
+   bool sysWriteEntry( const QString &, const QStringList &, const QChar& sep )
+   bool sysWriteEntry( const QString&key, const QStringList&data )
+*/
 #if !defined(Q_NO_BOOL_TYPE)
     bool	sysWriteEntry( const QString &, bool );
 #endif
     bool	sysWriteEntry( const QString &, double );
     bool	sysWriteEntry( const QString &, int );
     bool	sysWriteEntry( const QString &, const QString & );
-    bool	sysWriteEntry( const QString &, const QStringList & );
-    bool	sysWriteEntry( const QString &, const QStringList &, const QChar& sep );
 
     QStringList sysEntryList(const QString &) const;
     QStringList sysSubkeyList(const QString &) const;
 
-    QStringList sysReadListEntry( const QString &, bool * = 0 ) const;
-    QStringList sysReadListEntry( const QString &, const QChar& sep, bool * = 0 ) const;
     QString	sysReadEntry( const QString &, const QString &def = QString::null, bool * = 0 ) const;
     int		sysReadNumEntry( const QString &, int def = 0, bool * = 0 ) const;
     double	sysReadDoubleEntry( const QString &, double def = 0, bool * = 0 ) const;

Index: qstring.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qstring.cpp,v
retrieving revision 1.1.1.16
retrieving revision 1.1.1.17
diff -u -r1.1.1.16 -r1.1.1.17
--- qstring.cpp	22 Sep 2005 12:54:18 -0000	1.1.1.16
+++ qstring.cpp	30 Sep 2005 16:58:32 -0000	1.1.1.17
@@ -6987,7 +6987,7 @@
   implicit sharing mechanism is implemented this way.
 */
 
-#if defined(Q_OS_WIN32)
+#if defined(Q_WS_WIN)
 
 #include <windows.h>
 

Index: qstring.h
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qstring.h,v
retrieving revision 1.1.1.18
retrieving revision 1.1.1.19
diff -u -r1.1.1.18 -r1.1.1.19
--- qstring.h	22 Sep 2005 12:54:21 -0000	1.1.1.18
+++ qstring.h	30 Sep 2005 16:58:32 -0000	1.1.1.19
@@ -637,8 +637,10 @@
     QChar at( uint i ) const
         { return i < d->len ? d->unicode[i] : QChar::null; }
     QChar operator[]( int i ) const { return at((uint)i); }
+    QChar operator[]( uint i ) const { return at((uint)i); }
     QCharRef at( uint i );
     QCharRef operator[]( int i );
+    QCharRef operator[]( uint i );
 
     QChar constref(uint i) const
         { return at(i); }
@@ -808,6 +810,7 @@
 
 inline QCharRef QString::at( uint i ) { return QCharRef(this,i); }
 inline QCharRef QString::operator[]( int i ) { return at((uint)i); }
+inline QCharRef QString::operator[]( uint i ) { return at(i); }
 
 
 class Q_EXPORT QConstString : private QString {
@@ -1099,7 +1102,7 @@
 #endif
 
 
-#if defined(Q_OS_WIN32)
+#if defined(Q_WS_WIN)
 extern Q_EXPORT QString qt_winQString(void*);
 extern Q_EXPORT const void* qt_winTchar(const QString& str, bool addnul);
 extern Q_EXPORT void* qt_winTchar_new(const QString& str);

Index: qt_tools.pri
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qt_tools.pri,v
retrieving revision 1.1.1.8
retrieving revision 1.1.1.9
diff -u -r1.1.1.8 -r1.1.1.9
--- qt_tools.pri	22 Sep 2005 12:54:15 -0000	1.1.1.8
+++ qt_tools.pri	30 Sep 2005 16:58:32 -0000	1.1.1.9
@@ -69,7 +69,7 @@
 		  $$TOOLS_P/qucom_p.h \
 		  $$TOOLS_H/quuid.h
 
-	win32:SOURCES += $$TOOLS_CPP/qdir_win.cpp \
+	win32:!unix:SOURCES += $$TOOLS_CPP/qdir_win.cpp \
 	 	  $$TOOLS_CPP/qfile_win.cpp \
 		  $$TOOLS_CPP/qfileinfo_win.cpp \
 		  $$TOOLS_CPP/qlibrary_win.cpp \
@@ -79,6 +79,9 @@
 		  $$TOOLS_CPP/qthreadstorage_win.cpp \
 		  $$TOOLS_CPP/qcriticalsection_p.cpp
 
+	win32:unix:SOURCES += $$TOOLS_CPP/qsettings_win.cpp \
+			  $$TOOLS_CPP/qcriticalsection_p.cpp
+
 	win32-borland:SOURCES += $$TOOLS_CPP/qwinexport.cpp
 
 	wince-* {

[Kde-cygwin-cvs] CVS: qt-3/qmake/generators/unix unixmake2.cpp,1.1.1.19,1.1.1.20

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

Update of /cvsroot/kde-cygwin/qt-3/qmake/generators/unix
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6831/qmake/generators/unix

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

Index: unixmake2.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/qmake/generators/unix/unixmake2.cpp,v
retrieving revision 1.1.1.19
retrieving revision 1.1.1.20
diff -u -r1.1.1.19 -r1.1.1.20
--- unixmake2.cpp	22 Sep 2005 12:57:30 -0000	1.1.1.19
+++ unixmake2.cpp	30 Sep 2005 16:58:31 -0000	1.1.1.20
@@ -289,12 +289,33 @@
     t << "DESTDIR  = " << var("DESTDIR") << endl;
     if(project->isActiveConfig("compile_libtool"))
 	t << "TARGETL	= " << var("TARGET_la") << endl;
-    t << "TARGET   = " << var("TARGET") << endl;
-    if(project->isActiveConfig("plugin") ) {
-	t << "TARGETD   = " << var("TARGET") << endl;
+
+		if(!project->isEmpty("QMAKE_CYGWIN_SHLIB") ) {
+			if (project->first("TEMPLATE") == "lib" && project->isActiveConfig("dll")) {
+				if(project->isActiveConfig("plugin") ) {
+					t << "TARGET   = cyg" << var("QMAKE_ORIG_TARGET") << "-" << var("VER_MAJ") << "." << var("QMAKE_EXTENSION_SHLIB") << endl;
+					t << "TARGET0   = " << "lib" << var("QMAKE_ORIG_TARGET") << ".dll.a"  << endl;
+				}
+				else {
+					t << "TARGET   = ../bin/cyg" << var("QMAKE_ORIG_TARGET") << "-" << var("VER_MAJ") << "." << var("QMAKE_EXTENSION_SHLIB") << endl;
+					t << "TARGET0   = " << "lib" << var("QMAKE_ORIG_TARGET") << ".dll.a"  << endl;
+					t << "TARGETA   = " << var("TARGETA") << endl;
+				}
+			}
+			else if (project->first("TEMPLATE") == "lib" && project->isActiveConfig("staticlib")) {
+				t << "TARGET   = " << "lib" << var("QMAKE_ORIG_TARGET") << ".a" << endl;
+			}
+			else if (project->first("TEMPLATE") == "app") {
+				t << "TARGET   = " << var("TARGET") << endl;
+			}
+		}
+   else {
+ 		t << "TARGET   = " << var("TARGET") << endl;
+  	if(project->isActiveConfig("plugin") ) {
+			t << "TARGETD   = " << var("TARGET") << endl;
     } else if (!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty()) {
-	t << "TARGETA	= " << var("TARGETA") << endl;
-	if (project->isEmpty("QMAKE_HPUX_SHLIB")) {
+			t << "TARGETA	= " << var("TARGETA") << endl;
+			if (project->isEmpty("QMAKE_HPUX_SHLIB")) {
 	    t << "TARGETD	= " << var("TARGET_x.y.z") << endl;
 	    t << "TARGET0	= " << var("TARGET_") << endl;
 	    t << "TARGET1	= " << var("TARGET_x") << endl;
@@ -304,6 +325,7 @@
 	    t << "TARGET0	= " << var("TARGET_") << endl;
 	}
     }
+  }
     writeExtraVariables(t);
     t << endl;
 
@@ -548,9 +570,21 @@
 	if(!project->isEmpty("QMAKE_PRE_LINK"))
 	    t << "\n\t" << var("QMAKE_PRE_LINK");
 
+	if(!destdir.isEmpty() && !project->isEmpty("QMAKE_CYGWIN_SHLIB") && !project->isActiveConfig("plugin") )
+    t << "\n\t" << "test -d " << destdir << "../bin || mkdir -p " << destdir << "../bin";
+
 	if(project->isActiveConfig("compile_libtool")) {
 	    t << "\n\t"
 	      << var("QMAKE_LINK_SHLIB_CMD");
+	} else if(!project->isEmpty("QMAKE_CYGWIN_SHLIB")) {
+        project->variables()["QMAKE_LINK_SHLIB_CMD"] = "$(LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)";
+    t << "\n\t"
+      << "-$(DEL_FILE) $(DESTDIR)$(TARGET) $(DESTDIR)$(TARGET0)" << "\n\t"
+      << var("QMAKE_LINK_SHLIB_CMD") << "\n\t";
+    t << varGlue("QMAKE_LN_SHLIB",""," "," $(TARGET) $(DESTDIR)$(TARGET0)");
+    if(!project->isEmpty("QMAKE_POST_LINK"))
+        t << "\n\t" << var("QMAKE_POST_LINK");
+    t << endl << endl;
 	} else if(project->isActiveConfig("plugin")) {
 	    t << "\n\t"
 	      << "-$(DEL_FILE) $(TARGET)" << "\n\t"
@@ -1409,8 +1443,10 @@
     if(dot != -1)
 	ret = ret.left(dot);
     ret += Option::libtool_ext;
-    if(!project->isEmpty("DESTDIR"))
+    if(!project->isEmpty("DESTDIR")) {
 	ret.prepend(var("DESTDIR"));
+	ret = Option::fixPathToLocalOS(fileFixify(ret,QDir::currentDirPath(), Option::output_dir));
+		}
     return ret;
 }
 
@@ -1432,15 +1468,26 @@
     t << "# Generated by qmake/libtool (" << qmake_version() << ") (Qt "
       << QT_VERSION_STR << ") on: " << ctime(&now) << "\n";
 
-    t << "# The name that we can dlopen(3).\n"
-      << "dlname='" << var(project->isActiveConfig("plugin") ? "TARGET" : "TARGET_x")
+    t << "# The name that we can dlopen(3).\n";
+    
+    if (!project->isEmpty("QMAKE_CYGWIN_SHLIB")) {
+    	if(project->isActiveConfig("plugin") )
+				t << "dlname='cyg" << var("QMAKE_ORIG_TARGET") << "-" << var("VER_MAJ") << "." << var("QMAKE_EXTENSION_SHLIB") << "'\n\n" << endl;
+			else
+				t << "dlname='../bin/cyg" << var("QMAKE_ORIG_TARGET") << "-" << var("VER_MAJ") << "." << var("QMAKE_EXTENSION_SHLIB") << "'\n\n" << endl;
+		}
+    else {  
+      t << "dlname='" << var(project->isActiveConfig("plugin") ? "TARGET" : "TARGET_x")
       << "'\n\n";
-
+		}
     t << "# Names of this library.\n";
     t << "library_names='";
     if(project->isActiveConfig("plugin")) {
 	t << var("TARGET");
-    } else {
+    } else if(!project->isEmpty("QMAKE_CYGWIN_SHLIB")) {
+			t << "lib" << var("QMAKE_ORIG_TARGET") << ".dll.a";
+    }
+    else {
     	if (project->isEmpty("QMAKE_HPUX_SHLIB"))
 	    t << var("TARGET_x.y.z") << " ";
     	t << var("TARGET_x") << " " << var("TARGET_");

[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

[Kde-cygwin-cvs] CVS: qt-3/mkspecs/win32-msvc.net qmake.conf,1.1.1.12,1.1.1.13

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

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

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.net/qmake.conf,v
retrieving revision 1.1.1.12
retrieving revision 1.1.1.13
diff -u -r1.1.1.12 -r1.1.1.13
--- qmake.conf	22 Sep 2005 12:58:56 -0000	1.1.1.12
+++ qmake.conf	30 Sep 2005 16:58:31 -0000	1.1.1.13
@@ -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

[Kde-cygwin-cvs] CVS: qt-3/src/dialogs qfiledialog.cpp,1.1.1.21,1.1.1.22 qmessagebox.cpp,1.1.1.16,1.1.1.17 qt_dialogs.pri,1.1.1.10,1.1.1.11

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

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

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	qfiledialog.cpp qmessagebox.cpp qt_dialogs.pri 
Log Message:
reapply patches which were lost during my not so good update to 3.3.5

Index: qfiledialog.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/dialogs/qfiledialog.cpp,v
retrieving revision 1.1.1.21
retrieving revision 1.1.1.22
diff -u -r1.1.1.21 -r1.1.1.22
--- qfiledialog.cpp	22 Sep 2005 12:53:56 -0000	1.1.1.21
+++ qfiledialog.cpp	30 Sep 2005 16:58:31 -0000	1.1.1.22
@@ -113,6 +113,20 @@
 #undef check
 #endif
 
+#if defined(Q_OS_CYGWIN) && defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+int getlogin_r (char* name, size_t namesize )
+{
+	char *s = getlogin(); 
+	if (s) {
+	 	strncpy (name, s, namesize);
+		return 0; 
+	}	
+	else {
+		return -1;
+	}
+}
+#endif 
+
 /* XPM */
 static const char * const start_xpm[]={
     "16 15 8 1",
@@ -5708,6 +5722,9 @@
 {
     return d->url;
 }
+#if defined(Q_CYGWIN_WIN)
+Q_EXPORT int qt_ntfs_permission_lookup = 0;
+#endif 
 
 static bool isRoot( const QUrl &u )
 {

Index: qmessagebox.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/dialogs/qmessagebox.cpp,v
retrieving revision 1.1.1.16
retrieving revision 1.1.1.17
diff -u -r1.1.1.16 -r1.1.1.17
--- qmessagebox.cpp	22 Sep 2005 12:53:53 -0000	1.1.1.16
+++ qmessagebox.cpp	30 Sep 2005 16:58:31 -0000	1.1.1.17
@@ -595,7 +595,12 @@
 	    "<p>Qt is a Trolltech product. "
 	    "See <tt>http://www.trolltech.com/qt/</tt> "
 	    "for more information.</p>"
-	    ).arg( QT_VERSION_STR );
+	    ).arg( QT_VERSION_STR ) + tr (
+		"<hr><p>This is Qt/Windows Free Edition, an open-source "
+		"version of Qt/Windows developed independently of "
+		"Trolltech. See <tt>http://kde-cygwin.sourceforge.net/qt3-win32/</tt> "
+		"for more information.</p>"
+		);
 #endif
 
     }

Index: qt_dialogs.pri
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/dialogs/qt_dialogs.pri,v
retrieving revision 1.1.1.10
retrieving revision 1.1.1.11
diff -u -r1.1.1.10 -r1.1.1.11
--- qt_dialogs.pri	22 Sep 2005 12:53:57 -0000	1.1.1.10
+++ qt_dialogs.pri	30 Sep 2005 16:58:31 -0000	1.1.1.11
@@ -9,6 +9,7 @@
 		  $$DIALOGS_H/qfiledialog.h \
 		  $$DIALOGS_H/qfontdialog.h \
 		  $$DIALOGS_H/qmessagebox.h \
+		  $$DIALOGS_H/qprintdialog.h \
 		  $$DIALOGS_H/qprogressdialog.h \
 		  $$DIALOGS_H/qsemimodal.h \
 		  $$DIALOGS_H/qtabdialog.h \
@@ -17,8 +18,6 @@
 
         !embedded:mac:SOURCES  += $$DIALOGS_CPP/qfiledialog_mac.cpp $$DIALOGS_CPP/qcolordialog_mac.cpp
 	win32:SOURCES += $$DIALOGS_CPP/qfiledialog_win.cpp
-	unix:SOURCES += $$DIALOGS_CPP/qprintdialog.cpp
-	unix:HEADERS   += $$DIALOGS_H/qprintdialog.h 
 
 	SOURCES += $$DIALOGS_CPP/qcolordialog.cpp \
 		  $$DIALOGS_CPP/qdialog.cpp \
@@ -26,6 +25,7 @@
 		  $$DIALOGS_CPP/qfiledialog.cpp \
 		  $$DIALOGS_CPP/qfontdialog.cpp \
 		  $$DIALOGS_CPP/qmessagebox.cpp \
+		  $$DIALOGS_CPP/qprintdialog.cpp \
 		  $$DIALOGS_CPP/qprogressdialog.cpp \
 		  $$DIALOGS_CPP/qtabdialog.cpp \
 		  $$DIALOGS_CPP/qwizard.cpp \

[Kde-cygwin-cvs] CVS: qt-3/src/sql qt_sql.pri,1.1.1.11,1.1.1.12

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

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

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

Index: qt_sql.pri
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qt_sql.pri,v
retrieving revision 1.1.1.11
retrieving revision 1.1.1.12
diff -u -r1.1.1.11 -r1.1.1.12
--- qt_sql.pri	22 Sep 2005 12:53:47 -0000	1.1.1.11
+++ qt_sql.pri	30 Sep 2005 16:58:31 -0000	1.1.1.12
@@ -114,6 +114,12 @@
 			}
 		}
 
+		cygwin-g++ {
+			!contains( LIBS, .*odbc.* ) {
+				LIBS        *= -lodbc32
+			}
+		}
+		
 		unix {
 			!contains( LIBS, .*odbc.* ) {
 				LIBS        *= -lodbc

[Kde-cygwin-cvs] CVS: qt-3/src/moc moc_lex.cpp,1.1.1.16,1.1.1.17

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

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

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

Index: moc_lex.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/moc/moc_lex.cpp,v
retrieving revision 1.1.1.16
retrieving revision 1.1.1.17
diff -u -r1.1.1.16 -r1.1.1.17
--- moc_lex.cpp	22 Sep 2005 12:53:43 -0000	1.1.1.16
+++ moc_lex.cpp	30 Sep 2005 16:58:31 -0000	1.1.1.17
@@ -1046,7 +1046,7 @@
 #define IN_PROPERTY 12
 #define IN_CLASSINFO 13
 
-#ifndef YY_NO_UNISTD_H
+#if !defined (YY_NO_UNISTD_H) && !defined(Q_OS_WIN32)
 /* Special case for "unistd.h", since it is non-ANSI. We include it way
  * down here because we want the user's section 1 to have been scanned first.
  * The user has a chance to override it with an option.

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

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

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

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	qmake.conf 
Log Message:


Index: qmake.conf
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/win32-msvc/qmake.conf,v
retrieving revision 1.1.1.16
retrieving revision 1.1.1.17
diff -u -r1.1.1.16 -r1.1.1.17
--- qmake.conf	30 Sep 2005 16:58:31 -0000	1.1.1.16
+++ qmake.conf	30 Sep 2005 17:23:04 -0000	1.1.1.17
@@ -20,7 +20,7 @@
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= byacc
 QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -nologo -Zm200 -EHsc
+QMAKE_CFLAGS		= -nologo -Zm200
 QMAKE_CFLAGS_WARN_ON	= -W3
 QMAKE_CFLAGS_WARN_OFF	= -W0
 QMAKE_CFLAGS_RELEASE	= -O1

[Kde-cygwin-cvs] CVS: qt-3 qt-3-head.patch,1.1.2.1,1.1.2.2

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

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

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	qt-3-head.patch 
Log Message:


Index: qt-3-head.patch
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/Attic/qt-3-head.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- qt-3-head.patch	30 Sep 2005 16:58:30 -0000	1.1.2.1
+++ qt-3-head.patch	30 Sep 2005 17:23:04 -0000	1.1.2.2
@@ -366,31 +366,6 @@
  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
-Index: mkspecs/win32-msvc.net/qmake.conf
-===================================================================
-RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/win32-msvc.net/qmake.conf,v
-retrieving revision 1.1.1.12
-diff -u -r1.1.1.12 qmake.conf
---- mkspecs/win32-msvc.net/qmake.conf	22 Sep 2005 12:58:56 -0000	1.1.1.12
-+++ mkspecs/win32-msvc.net/qmake.conf	30 Sep 2005 16:45:24 -0000
-@@ -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
 Index: qmake/Makefile.win32-g++
 ===================================================================
 RCS file: /cvsroot/kde-cygwin/qt-3/qmake/Makefile.win32-g++,v

[Kde-cygwin-cvs] CVS: qt-3/examples examples.pro,1.1.1.10,1.1.1.11

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

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

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

Index: examples.pro
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/examples/examples.pro,v
retrieving revision 1.1.1.10
retrieving revision 1.1.1.11
diff -u -r1.1.1.10 -r1.1.1.11
--- examples.pro	22 Sep 2005 12:59:05 -0000	1.1.1.10
+++ examples.pro	30 Sep 2005 16:58:30 -0000	1.1.1.11
@@ -116,7 +116,7 @@
 
 embedded:SUBDIRS -= showimg
 
-win32:SUBDIRS += trayicon
+#win32:SUBDIRS += trayicon
 embedded:SUBDIRS += trayicon
 
 x11:SUBDIRS	+= biff \

[Kde-cygwin-cvs] CVS: qt-3/src/sql/drivers/odbc qsql_odbc.h,1.1.1.12,1.1.1.13

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

Update of /cvsroot/kde-cygwin/qt-3/src/sql/drivers/odbc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6831/src/sql/drivers/odbc

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

Index: qsql_odbc.h
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/drivers/odbc/qsql_odbc.h,v
retrieving revision 1.1.1.12
retrieving revision 1.1.1.13
diff -u -r1.1.1.12 -r1.1.1.13
--- qsql_odbc.h	22 Sep 2005 12:53:48 -0000	1.1.1.12
+++ qsql_odbc.h	30 Sep 2005 16:58:31 -0000	1.1.1.13
@@ -44,7 +44,7 @@
 #include <qsqlresult.h>
 #include <qsqlindex.h>
 
-#if defined (Q_OS_WIN32)
+#if defined (Q_OS_WIN32) || defined(Q_OS_CYGWIN)
 #include <qt_windows.h>
 #endif
 

[Kde-cygwin-cvs] CVS: qt-3/tools/linguist/linguist about.ui,1.1.1.9,1.1.1.10 main.cpp,1.1.1.9,1.1.1.10

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

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

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	about.ui main.cpp 
Log Message:
reapply patches which were lost during my not so good update to 3.3.5

Index: about.ui
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/about.ui,v
retrieving revision 1.1.1.9
retrieving revision 1.1.1.10
diff -u -r1.1.1.9 -r1.1.1.10
--- about.ui	22 Sep 2005 12:58:52 -0000	1.1.1.9
+++ about.ui	30 Sep 2005 16:58:32 -0000	1.1.1.10
@@ -108,7 +108,7 @@
                 </sizepolicy>
             </property>
             <property name="text">
-                <string>&lt;p&gt;Qt Commercial Edition license holders: This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.&lt;/p&gt;&lt;p&gt;&lt;/p&gt;&lt;p&gt;Qt Open Source Edition users: This program is licensed to you under the terms of the GNU General Public License Version 2. For details, see the file LICENSE.GPL that came with this software distribution.&lt;/p&gt;&lt;p&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;</string>
+                <string>&lt;p&gt;Qt Commercial Edition license holders: This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.&lt;/p&gt;&lt;p&gt;&lt;/p&gt;&lt;p&gt;Qt Free Edition users: This program is licensed to you under the terms of the GNU General Public License Version 2. For details, see the file LICENSE.GPL that came with this software distribution.&lt;/p&gt;&lt;p&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;</string>
             </property>
             <property name="alignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>

Index: main.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/main.cpp,v
retrieving revision 1.1.1.9
retrieving revision 1.1.1.10
diff -u -r1.1.1.9 -r1.1.1.10
--- main.cpp	22 Sep 2005 12:58:52 -0000	1.1.1.9
+++ main.cpp	30 Sep 2005 16:58:32 -0000	1.1.1.10
@@ -47,6 +47,7 @@
 
     bool showSplash = TRUE;
 
+/* obsolate code 
     QString keybase("/Qt Linguist/3.1/");
     QSettings config;
     config.insertSearchPath( QSettings::Windows, "/Trolltech" );
@@ -56,7 +57,7 @@
     r.setY( config.readNumEntry( keybase + "Geometry/MainwindowY", r.y() ) );
     r.setWidth( config.readNumEntry( keybase + "Geometry/MainwindowWidth", r.width() ) );
     r.setHeight( config.readNumEntry( keybase + "Geometry/MainwindowHeight", r.height() ) );
-
+*/
     QSplashScreen *splash = 0;
     if ( showSplash ) {
 	splash = new QSplashScreen( QPixmap::fromMimeSource("splash.png"),
@@ -70,6 +71,14 @@
     if ( app.argc() > 1 )
 	tw->openFile( QString(app.argv()[app.argc() - 1]) );
 
+		//<-- this is duplicated from trwindow.cpp and should be moved to there 
+    QString keybase( "/Qt Linguist/" +
+		     QString::number( (QT_VERSION >> 16) & 0xff ) +
+		     "." + QString::number( (QT_VERSION >> 8) & 0xff ) + "/" );
+    QSettings config;
+
+    config.insertSearchPath( QSettings::Windows, "/Trolltech" );
+		//-->
     if ( config.readBoolEntry( keybase + "Geometry/MainwindowMaximized", FALSE ) )
 	tw->showMaximized();
     else

[Kde-cygwin-cvs] CVS: qt-3 Makefile.cvs,1.1.1.8,NONE

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

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

Removed Files:
      Tag: QT_WIN32_3_3_BRANCH
	Makefile.cvs 
Log Message:


--- Makefile.cvs DELETED ---

[Kde-cygwin-cvs] CVS: qt-3 configure-msvc2005.bat,NONE,1.1.2.1 configure.bat,1.1.4.18,1.1.4.19 README.qt-copy,1.1.1.13,NONE

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

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

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	configure.bat 
Added Files:
      Tag: QT_WIN32_3_3_BRANCH
	configure-msvc2005.bat 
Removed Files:
      Tag: QT_WIN32_3_3_BRANCH
	README.qt-copy 
Log Message:


--- NEW FILE: configure-msvc2005.bat ---
::
:: $Id: configure-msvc2005.bat,v 1.1.2.1 2005/09/30 15:37:08 chehrlic Exp $
::
@echo off
echo Building Qt/Win Free for Microsoft Visual Studio 2005
set QMAKESPEC=win32-msvc2005
configure.bat %*

Index: configure.bat
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/Attic/configure.bat,v
retrieving revision 1.1.4.18
retrieving revision 1.1.4.19
diff -u -r1.1.4.18 -r1.1.4.19
--- configure.bat	29 Mar 2005 18:40:56 -0000	1.1.4.18
+++ configure.bat	30 Sep 2005 15:37:08 -0000	1.1.4.19
@@ -57,6 +57,7 @@
 
 if %QMAKESPEC% == win32-msvc set MAKE=nmake /NOLOGO
 if %QMAKESPEC% == win32-msvc.net set MAKE=nmake /NOLOGO 
+if %QMAKESPEC% == win32-msvc2005 set MAKE=nmake /NOLOGO 
 if %QMAKESPEC% == win32-g++ (
 	:: MinGW and cygwin does not work, look for sh.exe 	
 	"%QTDIR%\misc\findpath\findpath" sh.exe >nul
@@ -82,6 +83,7 @@
 set MAKEFILE=Makefile.%QMAKESPEC%
 
 if %QMAKESPEC% == win32-msvc.net set MAKEFILE=Makefile.win32-msvc
+if %QMAKESPEC% == win32-msvc2005 set MAKEFILE=Makefile.win32-msvc
 
 :: 
 echo install headers for bootstrapping...

--- README.qt-copy DELETED ---

[Kde-cygwin-cvs] CVS: qt-3/doc metaobjects.doc,1.1.1.6,1.1.1.7 misc.doc,1.1.1.11,1.1.1.12 moc.doc,1.1.1.6,1.1.1.7 modules.doc,1.1.1.9,1.1.1.10 network.doc,1.1.1.6,1.1.1.7 object.doc,1.1.1.8,1.1.1.9 opengl-x11-overlays.doc,1.1.1.2,1.1.1.3 overviews-list.doc,1.1.1.6,1.1.1.7 pictures.doc,1.1.1.7,1.1.1.8 plugins-howto.doc,1.1.1.6,1.1.1.7 porting2.doc,1.1.1.8,1.1.1.9 porting3.doc,1.1.1.10,1.1.1.11 primes.doc,1.1.1.6,1.1.1.7 qasciicache.doc,1.1.1.5,1.1.1.6 qasciidict.doc,1.1.1.6,1.1.1.7 qcache.doc,1.1.1.6,1.1.1.7 qcollection-compat.doc,1.1.1.5,1.1.1.6 qdict.doc,1.1.1.6,1.1.1.7 qguardedptr.doc,1.1.1.5,1.1.1.6 qintcache.doc,1.1.1.5,1.1.1.6 qintdict.doc,1.1.1.6,1.1.1.7 qmap.doc,1.1.1.10,1.1.1.11 qmemarray.doc,1.1.1.6,1.1.1.7 qpair.doc,1.1.1.3,1.1.1.4 qptrdict.doc,1.1.1.6,1.1.1.7 qptrlist.doc,1.1.1.6,1.1.1.7 qptrqueue.doc,1.1.1.5,1.1.1.6 qptrstack.doc,1.1.1.6,1.1.1.7 qptrvector.doc,1.1.1.5,1.1.1.6 qsortedlist.doc,1.1.1.5,1.1.1.6 qtl.doc,1.1.1.7,1.1.1.8 qtmac-as-native.doc,1.1.1.4,1.1.1.5 qvaluelist.doc,1.1.1.11,1.1.1.12 qvaluestack.doc,1.1.1.5,1.1.1.6 qvaluevector.doc,1.1.1.4,1.1.1.5 qvfb.doc,1.1.1.6,1.1.1.7 qws.doc,1.1.1.10,1.1.1.11 session.doc,1.1.1.5,1.1.1.6 shclass.doc,1.1.1.6,1.1.1.7 signalsandslots.doc,1.1.1.7,1.1.1.8 sql-driver.doc,1.1.1.8,1.1.1.9 sql.doc,1.1.1.10,1.1.1.11 table.doc,1.1.1.7,1.1.1.8 threads.doc,1.1.1.7,1.1.1.8 tutorial.doc,1.1.1.6,1.1.1.7 unicode.doc,1.1.1.7,1.1.1.8 winsystem.doc,1.1.1.6,1.1.1.7 xml-sax-features-walkthrough.doc,1.1.1.5,1.1.1.6 xml-sax-walkthrough.doc,1.1.1.5,1.1.1.6 xml.doc,1.1.1.7,1.1.1.8 y2k.doc,1.1.1.5,1.1.1.6

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

Update of /cvsroot/kde-cygwin/qt-3/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13083/doc

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	metaobjects.doc misc.doc moc.doc modules.doc network.doc 
	object.doc opengl-x11-overlays.doc overviews-list.doc 
	pictures.doc plugins-howto.doc porting2.doc porting3.doc 
	primes.doc qasciicache.doc qasciidict.doc qcache.doc 
	qcollection-compat.doc qdict.doc qguardedptr.doc qintcache.doc 
	qintdict.doc qmap.doc qmemarray.doc qpair.doc qptrdict.doc 
	qptrlist.doc qptrqueue.doc qptrstack.doc qptrvector.doc 
	qsortedlist.doc qtl.doc qtmac-as-native.doc qvaluelist.doc 
	qvaluestack.doc qvaluevector.doc qvfb.doc qws.doc session.doc 
	shclass.doc signalsandslots.doc sql-driver.doc sql.doc 
	table.doc threads.doc tutorial.doc unicode.doc winsystem.doc 
	xml-sax-features-walkthrough.doc xml-sax-walkthrough.doc 
	xml.doc y2k.doc 
Log Message:


Index: metaobjects.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/metaobjects.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- metaobjects.doc	1 Oct 2003 07:17:05 -0000	1.1.1.6
+++ metaobjects.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Explanation of moc and the meta object system
 **
-** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: misc.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/misc.doc,v
retrieving revision 1.1.1.11
retrieving revision 1.1.1.12
diff -u -r1.1.1.11 -r1.1.1.12
--- misc.doc	9 Apr 2005 10:35:15 -0000	1.1.1.11
+++ misc.doc	30 Sep 2005 15:26:52 -0000	1.1.1.12
@@ -1,1123 +1,1124 @@
-/****************************************************************************
-** 
-**
-** Miscellaneous documentation that doesn't fit anywhere else
-**
-** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
[...2216 lines suppressed...]
+both pos() and size() and to restore the geometry using resize() and
+move() before calling show(), as demonstrated in the following
+example:
+
+\code
+    MyWidget* widget = new MyWidget
+    ...
+    QPoint p = widget->pos();	// store position
+    QSize s = widget->size();	// store size
+    ...
+    widget = new MyWidget;
+    widget->resize( s ); 	// restore size
+    widget->move( p ); 		// restore position
+    widget->show();		// show widget
+\endcode
+
+This method works on both MS-Windows and most existing X11 window
+managers.
+
+*/

Index: moc.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/moc.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- moc.doc	1 Oct 2003 07:17:05 -0000	1.1.1.6
+++ moc.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Moc usage, expanded from the manual page
 **
-** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: modules.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/modules.doc,v
retrieving revision 1.1.1.9
retrieving revision 1.1.1.10
diff -u -r1.1.1.9 -r1.1.1.10
--- modules.doc	9 Apr 2005 10:35:15 -0000	1.1.1.9
+++ modules.doc	30 Sep 2005 15:26:52 -0000	1.1.1.10
@@ -1,101 +1,101 @@
-/****************************************************************************
-** 
-**
-** Documentation to some of the modules
-**
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sa...@tr... for
-**   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact in...@tr... if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-\page modules.html
-
-\title About Modules
-
-When you install Qt, certain modules are built into the library. For
-the Qt Enterprise Edition, Qt Evaluation Edition and Qt Open Source Edition
-this is all modules. For Qt Professional Edition, the base modules
-are available: the \e{tools}, \e{kernel}, \e{widgets}, \e{dialog},
-\e{iconview}, and \e{workspace} modules. Trolltech does not currently
-offer modules for sale individually.
-
-All modules may be used only under the terms of the licenses associated
-with each Edition.
-
-\list
-\i \link canvas.html Canvas Module\endlink
-\i \link iconview.html IconView Module\endlink
-\i \link network.html Network Module\endlink
-\i \link opengl.html OpenGL Module\endlink
-\i \link sql.html SQL Module\endlink
-\i \link table.html Table Module\endlink
-\i \link workspace.html Workspace (MDI) Module\endlink
-\i \link xml.html XML Module\endlink
-\i \link activeqt.html ActiveQt Framework\endlink:
-    \list
-    \i \link qaxserver.html QAxServer Module\endlink
-    \i \link qaxcontainer.html QAxContainer Module\endlink
-    \endlist
-\i \link motif-extension.html QMotif Extension\endlink
-\i \link netscape-plugin.html Netscape Plugin Extension\endlink
-\endlist
-
-*/
-
-/*!
-\page iconview.html
-
-\title IconView Module
-
-The icon view module provides a powerful visualization widget called
-\l QIconView. API and feature-wise it is similar to \l QListView and
-\l QListBox. It contains optionally labelled pixmap items that the user
-can select, drag around, rename, delete, etc.
-
-<center><a href="qiconview.html"><img src="qiconview-w.png" alt="Screenshot of QIconVIew"></a></center>
-
-Please see the \link qiconview.html class documentation \endlink for
-details.
-
-*/
-
-/*!
-\page workspace.html
-
-\title Workspace Module
-
-The workspace module provides a workspace window that can contain
-decorated document windows for Multiple Document Interfaces (MDI).
-
-It is implemented in a single class \l QWorkspace.
-
-Please see the \link qworkspace.html class documentation \endlink for
-details.
-
-*/
+/****************************************************************************
+** $Id$
+**
+** Documentation to some of the modules
+**
+** Copyright (C) 2000-2005 Trolltech AS.  All rights reserved.
+**
+** This file is part of the Qt GUI Toolkit.
+**
+** This file may be distributed under the terms of the Q Public License
+** as defined by Trolltech AS of Norway and appearing in the file
+** LICENSE.QPL included in the packaging of this file.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
+** licenses may use this file in accordance with the Qt Commercial License
+** Agreement provided with the Software.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/pricing.html or email sa...@tr... for
+**   information about Qt Commercial License Agreements.
+** See http://www.trolltech.com/qpl/ for QPL licensing information.
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact in...@tr... if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+\page modules.html
+
+\title About Modules
+
+When you install Qt, certain modules are built into the library. For
+the Qt Enterprise Edition, Qt Evaluation Edition and Qt Open Source Edition
+this is all modules. For Qt Professional Edition, the base modules
+are available: the \e{tools}, \e{kernel}, \e{widgets}, \e{dialog},
+\e{iconview}, and \e{workspace} modules. Trolltech does not currently
+offer modules for sale individually.
+
+All modules may be used only under the terms of the licenses associated
+with each Edition.
+
+\list
+\i \link canvas.html Canvas Module\endlink
+\i \link iconview.html IconView Module\endlink
+\i \link network.html Network Module\endlink
+\i \link opengl.html OpenGL Module\endlink
+\i \link sql.html SQL Module\endlink
+\i \link table.html Table Module\endlink
+\i \link workspace.html Workspace (MDI) Module\endlink
+\i \link xml.html XML Module\endlink
+\i \link activeqt.html ActiveQt Framework\endlink:
+    \list
+    \i \link qaxserver.html QAxServer Module\endlink
+    \i \link qaxcontainer.html QAxContainer Module\endlink
+    \endlist
+\i \link motif-extension.html QMotif Extension\endlink
+\i \link netscape-plugin.html Netscape Plugin Extension\endlink
+\endlist
+
+*/
+
+/*!
+\page iconview.html
+
+\title IconView Module
+
+The icon view module provides a powerful visualization widget called
+\l QIconView. API and feature-wise it is similar to \l QListView and
+\l QListBox. It contains optionally labelled pixmap items that the user
+can select, drag around, rename, delete, etc.
+
+<center><a href="qiconview.html"><img src="qiconview-w.png" alt="Screenshot of QIconVIew"></a></center>
+
+Please see the \link qiconview.html class documentation \endlink for
+details.
+
+*/
+
+/*!
+\page workspace.html
+
+\title Workspace Module
+
+The workspace module provides a workspace window that can contain
+decorated document windows for Multiple Document Interfaces (MDI).
+
+It is implemented in a single class \l QWorkspace.
+
+Please see the \link qworkspace.html class documentation \endlink for
+details.
+
+*/

Index: network.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/network.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- network.doc	1 Oct 2003 07:17:05 -0000	1.1.1.6
+++ network.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Documentation for network programming
 **
-** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: object.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/object.doc,v
retrieving revision 1.1.1.8
retrieving revision 1.1.1.9
diff -u -r1.1.1.8 -r1.1.1.9
--- object.doc	27 Aug 2004 21:24:13 -0000	1.1.1.8
+++ object.doc	30 Sep 2005 15:26:52 -0000	1.1.1.9
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Explanation of the Qt object model
 **
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: opengl-x11-overlays.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/opengl-x11-overlays.doc,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.3
diff -u -r1.1.1.2 -r1.1.1.3
--- opengl-x11-overlays.doc	1 Oct 2003 07:17:05 -0000	1.1.1.2
+++ opengl-x11-overlays.doc	30 Sep 2005 15:26:52 -0000	1.1.1.3
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** ...
 **
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: overviews-list.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/overviews-list.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- overviews-list.doc	27 Aug 2004 21:24:13 -0000	1.1.1.6
+++ overviews-list.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Explanation of the Qt object model
 **
-** Copyright (C) 2000-2003 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: pictures.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/pictures.doc,v
retrieving revision 1.1.1.7
retrieving revision 1.1.1.8
diff -u -r1.1.1.7 -r1.1.1.8
--- pictures.doc	27 Aug 2004 21:24:13 -0000	1.1.1.7
+++ pictures.doc	30 Sep 2005 15:26:52 -0000	1.1.1.8
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Pictures of Most Widgets in Qt
 **
-** Copyright (C) 1992-2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: plugins-howto.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/plugins-howto.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- plugins-howto.doc	27 Aug 2004 21:24:13 -0000	1.1.1.6
+++ plugins-howto.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** ...
 **
-** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: porting2.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/porting2.doc,v
retrieving revision 1.1.1.8
retrieving revision 1.1.1.9
diff -u -r1.1.1.8 -r1.1.1.9
--- porting2.doc	27 Aug 2004 21:24:13 -0000	1.1.1.8
+++ porting2.doc	30 Sep 2005 15:26:52 -0000	1.1.1.9
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Help with porting from Qt 1.x to Qt 2.x
 **
-** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: porting3.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/porting3.doc,v
retrieving revision 1.1.1.10
retrieving revision 1.1.1.11
diff -u -r1.1.1.10 -r1.1.1.11
--- porting3.doc	9 Apr 2005 10:35:15 -0000	1.1.1.10
+++ porting3.doc	30 Sep 2005 15:26:52 -0000	1.1.1.11
@@ -1,813 +1,813 @@
-/****************************************************************************
-** 
-**
-** Help with porting from Qt 2.x to Qt 3.x
-**
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
[...1595 lines suppressed...]
+respectively. Neither the arguments nor the resulting curve have changed.
+
+\section1 Locale-aware String Comparisons in QIconView, QListBox,
+	  QListView and QTable
+
+In Qt 2.x, QString only provided string comparisons using the Unicode
+values of the characters of a string. This is efficient and reliable,
+but it is not the appropriate order for most languages. For example,
+French users expect '&eacute;' (e acute) to be treated essentially as
+'e' and not put after 'z'.
+
+In Qt 3.0, QString::localeAwareCompare() implements locale aware
+string comparisions on certain platforms. The classes \l QIconView, \l
+QListBox, \l QListView and \l QTable now use
+QString::localeAwareCompare() instead of QString::compare(). If you
+want to control the behaviour yourself you can always reimplement
+QIconViewItem::compare(), QListBox::text(), QListViewItem::compare()
+or QTableItem::key() as appropriate.
+
+*/

Index: primes.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/primes.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- primes.doc	1 Oct 2003 07:17:06 -0000	1.1.1.6
+++ primes.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Prime numbers
 **
-** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qasciicache.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qasciicache.doc,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.6
diff -u -r1.1.1.5 -r1.1.1.6
--- qasciicache.doc	14 Jan 2003 14:35:14 -0000	1.1.1.5
+++ qasciicache.doc	30 Sep 2005 15:26:52 -0000	1.1.1.6
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QAsciiCache and QAsciiCacheIterator class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qasciidict.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qasciidict.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- qasciidict.doc	1 Oct 2003 07:17:06 -0000	1.1.1.6
+++ qasciidict.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QAsciiDict and QAsciiDictIterator class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qcache.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qcache.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- qcache.doc	27 Aug 2004 21:24:13 -0000	1.1.1.6
+++ qcache.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QCache and QCacheIterator class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qcollection-compat.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qcollection-compat.doc,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.6
diff -u -r1.1.1.5 -r1.1.1.6
--- qcollection-compat.doc	14 Jan 2003 14:35:14 -0000	1.1.1.5
+++ qcollection-compat.doc	30 Sep 2005 15:26:52 -0000	1.1.1.6
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QCollection fake documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qdict.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qdict.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- qdict.doc	1 Oct 2003 07:17:06 -0000	1.1.1.6
+++ qdict.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QDict and QDictIterator class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qguardedptr.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qguardedptr.doc,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.6
diff -u -r1.1.1.5 -r1.1.1.6
--- qguardedptr.doc	14 Jan 2003 14:35:14 -0000	1.1.1.5
+++ qguardedptr.doc	30 Sep 2005 15:26:52 -0000	1.1.1.6
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QGuardedPtr class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qintcache.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qintcache.doc,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.6
diff -u -r1.1.1.5 -r1.1.1.6
--- qintcache.doc	14 Jan 2003 14:35:14 -0000	1.1.1.5
+++ qintcache.doc	30 Sep 2005 15:26:52 -0000	1.1.1.6
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QIntCache and QIntCacheIterator class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qintdict.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qintdict.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- qintdict.doc	1 Oct 2003 07:17:06 -0000	1.1.1.6
+++ qintdict.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QIntDict and QIntDictIterator class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qmap.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qmap.doc,v
retrieving revision 1.1.1.10
retrieving revision 1.1.1.11
diff -u -r1.1.1.10 -r1.1.1.11
--- qmap.doc	9 Apr 2005 10:35:15 -0000	1.1.1.10
+++ qmap.doc	30 Sep 2005 15:26:52 -0000	1.1.1.11
@@ -1,899 +1,899 @@
-/****************************************************************************
-** 
-**
-** QMap and QMapIterator class documentation
-**
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
[...1767 lines suppressed...]
+*/
+
+/*!
+    \fn bool QMapConstIterator::operator!=( const QMapConstIterator<K,T>& it ) const
+
+    Compares the iterator to the \a it iterator and returns FALSE if
+    they point to the same item; otherwise returns TRUE.
+*/
+
+/*!
+    \fn const T& QMapConstIterator::data() const
+
+    Returns a const reference to the current item's data.
+*/
+
+/*!
+    \fn const K& QMapConstIterator::key() const
+
+    Returns a const reference to the current item's key.
+*/

Index: qmemarray.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qmemarray.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- qmemarray.doc	1 Oct 2003 07:17:06 -0000	1.1.1.6
+++ qmemarray.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QMemArray class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **
@@ -284,13 +284,12 @@
 
     New elements are not initialized.
 
-    \a optim is either QGArray::MemOptim (the default) or
-    QGArray::SpeedOptim. When optimizing for speed rather than memory
-    consumption, the array uses a smart grow and shrink algorithm that
-    might allocate more memory than is actually needed for \a size
-    elements. This speeds up subsequent resize operations, for example
-    when appending many elements to an array, since the space has
-    already been allocated.
+    \a optim is either \c QGArray::MemOptim (the default) or
+    \c QGArray::SpeedOptim.
+
+    <b>Note:</b> By default, \c SpeedOptim is not available for general
+    use since it is only available if Qt is built in a particular
+    configuration.
 
     \sa size()
 */

Index: qpair.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qpair.doc,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.4
diff -u -r1.1.1.3 -r1.1.1.4
--- qpair.doc	27 Aug 2004 21:24:13 -0000	1.1.1.3
+++ qpair.doc	30 Sep 2005 15:26:52 -0000	1.1.1.4
@@ -2,7 +2,7 @@
 **
 ** QPair class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qptrdict.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qptrdict.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- qptrdict.doc	1 Oct 2003 07:17:06 -0000	1.1.1.6
+++ qptrdict.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QPtrDict and QPtrDictIterator class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qptrlist.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qptrlist.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- qptrlist.doc	1 Oct 2003 07:17:06 -0000	1.1.1.6
+++ qptrlist.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QPtrList and QPtrListIterator class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qptrqueue.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qptrqueue.doc,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.6
diff -u -r1.1.1.5 -r1.1.1.6
--- qptrqueue.doc	14 Jan 2003 14:35:14 -0000	1.1.1.5
+++ qptrqueue.doc	30 Sep 2005 15:26:52 -0000	1.1.1.6
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QPtrQueue class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qptrstack.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qptrstack.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- qptrstack.doc	27 Aug 2004 21:24:13 -0000	1.1.1.6
+++ qptrstack.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QPtrStack class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qptrvector.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qptrvector.doc,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.6
diff -u -r1.1.1.5 -r1.1.1.6
--- qptrvector.doc	14 Jan 2003 14:35:14 -0000	1.1.1.5
+++ qptrvector.doc	30 Sep 2005 15:26:52 -0000	1.1.1.6
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QPtrVector class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qsortedlist.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qsortedlist.doc,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.6
diff -u -r1.1.1.5 -r1.1.1.6
--- qsortedlist.doc	14 Jan 2003 14:35:14 -0000	1.1.1.5
+++ qsortedlist.doc	30 Sep 2005 15:26:52 -0000	1.1.1.6
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QSortedList documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qtl.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qtl.doc,v
retrieving revision 1.1.1.7
retrieving revision 1.1.1.8
diff -u -r1.1.1.7 -r1.1.1.8
--- qtl.doc	27 Aug 2004 21:24:13 -0000	1.1.1.7
+++ qtl.doc	30 Sep 2005 15:26:52 -0000	1.1.1.8
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Qt Template Library classes documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qtmac-as-native.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qtmac-as-native.doc,v
retrieving revision 1.1.1.4
retrieving revision 1.1.1.5
diff -u -r1.1.1.4 -r1.1.1.5
--- qtmac-as-native.doc	9 Apr 2005 10:35:15 -0000	1.1.1.4
+++ qtmac-as-native.doc	30 Sep 2005 15:26:52 -0000	1.1.1.5
@@ -1,160 +1,160 @@
-/****************************************************************************
-** 
-**
-** Qt/Mac documentation
-**
-** Copyright (C) 2002-2004 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sa...@tr... for
-**   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact in...@tr... if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-
-\page qtmac-as-native.html
-
-\title Qt/Mac is Mac OS X Native
-
-This document explains what makes an application "native" on Mac OS X.
-It shows the areas where Qt/Mac is compliant, and the grey areas where
-compliance is more questionable. (See also the document 
-\link mac-differences.html Qt/Mac Issues\endlink.)
-
-Normally when referring to a native application, one really means an
-application that talks directly to the underlying window system and
-operating system, rather than one that uses some intermediary (for
-example the X11 server, or a web browser). Qt/Mac applications run as
-first class citizens, just like Cocoa, Java, and Carbon applications. 
-
-When an application is running as a first class citizen it means that
-it can interact with specific components of the Mac OS X experience:
-
-\list
-\i <b>The global menubar</b><br>
-
-   Qt/Mac does this via the QMenuBar abstraction. Mac users expect to
-   have a menubar at the top of the screen and Qt/Mac honors this.
-
-   Additionally, users expect certain conventions to be respected, for
-   example the application menu should contain About, Preferences,
-   Quit, etc. Qt/Mac handles this automatically, although it does not
-   provide a means of interacting directly with the application menu.
-   (By doing this automatically, Qt/Mac makes it easier to port Qt/Mac
-   applications to other platforms.)
-
-\i <b>Aqua</b><br>
-
-   This is a critical piece of Mac OS X (documentation can be found at
-   \l{http://developer.apple.com/documentation/UserExperience/Conceptual/OSXHIGuidelines/index.html}).
-   It is a huge topic, but the most important guidelines for GUI
-   design are probably these:
-
-    \list
-    \i \e{Aqua look}<br>
-
-      As with Cocoa/Carbon Qt/Mac provides widgets that look like
-      those described in the Human Interface Descriptions. Qt/Mac's
-      widgets use the Appearance Manager to implement the look, so
-      Apple's own API's are doing the rendering (Qt/Mac \<3.1 used an
-      emulation style with pixmaps, however this quickly proved to be
-      cumbersome, and unable to keep up with style changes at Apple).
-
-    \i \e{Aqua feel}<br>
-
-      This is a bit more subjective, but certainly Qt/Mac strives to
-      provide the same feel as any Mac OS X application (and we
-      consider situations where it doesn't achieve this to be bugs).
-      Of course Qt has other concerns to bear in mind, especially
-      remaining multiplatform. Some "baggage" that Qt carries is in
-      an effort to provide a widget on a platform for which an
-      equivelant doesn't exist, or so that a single API can be used to
-      do something, even if the API doesn't make entire sense for a
-      specific widget (for example pushbuttons with a popup menu are
-      really bevel buttons in Mac OS X, but Qt/Mac cannot guess that
-      this bevel button is right next to other real pushbuttons).
-
-    \i \e{Aqua guides}<br>
-
-      This is the most subjective, but there are many suggestions and
-      guidelines in the Aqua style guidelines. This is the area where
-      Qt/Mac is of least assistance. The decisions that must be made
-      to conform (widget sizes, widget layouts with respect to other
-      widgets, window margins, etc) must be made based on the user
-      experience demanded by your application. If your user base is
-      small or mostly comes from the Windows or Unix worlds, these are
-      minor issues much less important than trying to make a mass
-      market product. Qt/Mac is fully API compatible with Qt/Windows
-      and Qt/X11, but Mac OS X is a significantly different platform
-      to Windows and some special considerations must be made based on
-      your audience.
-
-    \endlist
-
-\i <b>Dock</b><br>
-
-   Interaction with the dock is limited, but at the very least the icon
-   should be able to be interacted with. This can be achieved with
-   QWidget::setIcon(). The setIcon() call can be made as often as
-   necessary, so can be used to provide a constantly updating pixmap
-   that works as expected.
-
-\i <b>Accessiblity</b><br>
-
-   Although many users never use this, some users will only interact
-   with your applications via assistive devices. With Qt the aim is to
-   make this automatic in your application so that it conforms to
-   accepted practice on its platform (X11 accessiblity support is
-   still in the works due to the developing nature of its
-   accessibility design). With Qt 3.3 Qt/Mac will support
-   accessiblity, and hopefully a host of assistive devices.
-
-\i <b>Build tools</b><br>
-
-   Mac OS X developers expect a certain level of interopability
-   between their development toolkit and the platform's developer
-   tools (for example MSVC, gmake, etc). Qt/Mac supports both Unix
-   style Makefiles, and ProjectBuilder/Xcode project files by using
-   the qmake tool. For example:
-
-   \code
-   qmake -spec macx-pbuilder project.pro
-   \endcode
-
-   will generate an Xcode project file from project.pro. With qmake
-   you do not have to worry about rules for Qt's preprocessors (moc
-   and uic) since qmake automatically handles them and ensures that
-   everything necessary is linked into your application.
-
-   Qt does not entirely interact with the development environment (for
-   example plugins to set a file to 'mocable' from within the Xcode
-   user interface). Trolltech is actively working on improving Qt's
-   interoperability with various IDEs, so hopefully this will be
-   supported soon.
-
-\endlist
-
-*/
+/****************************************************************************
+** $Id$
+**
+** Qt/Mac documentation
+**
+** Copyright (C) 2002-2005 Trolltech AS.  All rights reserved.
+**
+** This file is part of the Qt GUI Toolkit.
+**
+** This file may be distributed under the terms of the Q Public License
+** as defined by Trolltech AS of Norway and appearing in the file
+** LICENSE.QPL included in the packaging of this file.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
+** licenses may use this file in accordance with the Qt Commercial License
+** Agreement provided with the Software.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/pricing.html or email sa...@tr... for
+**   information about Qt Commercial License Agreements.
+** See http://www.trolltech.com/qpl/ for QPL licensing information.
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact in...@tr... if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+
+\page qtmac-as-native.html
+
+\title Qt/Mac is Mac OS X Native
+
+This document explains what makes an application "native" on Mac OS X.
+It shows the areas where Qt/Mac is compliant, and the grey areas where
+compliance is more questionable. (See also the document 
+\link mac-differences.html Qt/Mac Issues\endlink.)
+
+Normally when referring to a native application, one really means an
+application that talks directly to the underlying window system and
+operating system, rather than one that uses some intermediary (for
+example the X11 server, or a web browser). Qt/Mac applications run as
+first class citizens, just like Cocoa, Java, and Carbon applications. 
+
+When an application is running as a first class citizen it means that
+it can interact with specific components of the Mac OS X experience:
+
+\list
+\i <b>The global menubar</b><br>
+
+   Qt/Mac does this via the QMenuBar abstraction. Mac users expect to
+   have a menubar at the top of the screen and Qt/Mac honors this.
+
+   Additionally, users expect certain conventions to be respected, for
+   example the application menu should contain About, Preferences,
+   Quit, etc. Qt/Mac handles this automatically, although it does not
+   provide a means of interacting directly with the application menu.
+   (By doing this automatically, Qt/Mac makes it easier to port Qt/Mac
+   applications to other platforms.)
+
+\i <b>Aqua</b><br>
+
+   This is a critical piece of Mac OS X (documentation can be found at
+   \l{http://developer.apple.com/documentation/UserExperience/Conceptual/OSXHIGuidelines/index.html}).
+   It is a huge topic, but the most important guidelines for GUI
+   design are probably these:
+
+    \list
+    \i \e{Aqua look}<br>
+
+      As with Cocoa/Carbon Qt/Mac provides widgets that look like
+      those described in the Human Interface Descriptions. Qt/Mac's
+      widgets use the Appearance Manager to implement the look, so
+      Apple's own API's are doing the rendering (Qt/Mac \<3.1 used an
+      emulation style with pixmaps, however this quickly proved to be
+      cumbersome, and unable to keep up with style changes at Apple).
+
+    \i \e{Aqua feel}<br>
+
+      This is a bit more subjective, but certainly Qt/Mac strives to
+      provide the same feel as any Mac OS X application (and we
+      consider situations where it doesn't achieve this to be bugs).
+      Of course Qt has other concerns to bear in mind, especially
+      remaining multiplatform. Some "baggage" that Qt carries is in
+      an effort to provide a widget on a platform for which an
+      equivelant doesn't exist, or so that a single API can be used to
+      do something, even if the API doesn't make entire sense for a
+      specific widget (for example pushbuttons with a popup menu are
+      really bevel buttons in Mac OS X, but Qt/Mac cannot guess that
+      this bevel button is right next to other real pushbuttons).
+
+    \i \e{Aqua guides}<br>
+
+      This is the most subjective, but there are many suggestions and
+      guidelines in the Aqua style guidelines. This is the area where
+      Qt/Mac is of least assistance. The decisions that must be made
+      to conform (widget sizes, widget layouts with respect to other
+      widgets, window margins, etc) must be made based on the user
+      experience demanded by your application. If your user base is
+      small or mostly comes from the Windows or Unix worlds, these are
+      minor issues much less important than trying to make a mass
+      market product. Qt/Mac is fully API compatible with Qt/Windows
+      and Qt/X11, but Mac OS X is a significantly different platform
+      to Windows and some special considerations must be made based on
+      your audience.
+
+    \endlist
+
+\i <b>Dock</b><br>
+
+   Interaction with the dock is limited, but at the very least the icon
+   should be able to be interacted with. This can be achieved with
+   QWidget::setIcon(). The setIcon() call can be made as often as
+   necessary, so can be used to provide a constantly updating pixmap
+   that works as expected.
+
+\i <b>Accessiblity</b><br>
+
+   Although many users never use this, some users will only interact
+   with your applications via assistive devices. With Qt the aim is to
+   make this automatic in your application so that it conforms to
+   accepted practice on its platform (X11 accessiblity support is
+   still in the works due to the developing nature of its
+   accessibility design). With Qt 3.3 Qt/Mac will support
+   accessiblity, and hopefully a host of assistive devices.
+
+\i <b>Build tools</b><br>
+
+   Mac OS X developers expect a certain level of interopability
+   between their development toolkit and the platform's developer
+   tools (for example MSVC, gmake, etc). Qt/Mac supports both Unix
+   style Makefiles, and ProjectBuilder/Xcode project files by using
+   the qmake tool. For example:
+
+   \code
+   qmake -spec macx-pbuilder project.pro
+   \endcode
+
+   will generate an Xcode project file from project.pro. With qmake
+   you do not have to worry about rules for Qt's preprocessors (moc
+   and uic) since qmake automatically handles them and ensures that
+   everything necessary is linked into your application.
+
+   Qt does not entirely interact with the development environment (for
+   example plugins to set a file to 'mocable' from within the Xcode
+   user interface). Trolltech is actively working on improving Qt's
+   interoperability with various IDEs, so hopefully this will be
+   supported soon.
+
+\endlist
+
+*/

Index: qvaluelist.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qvaluelist.doc,v
retrieving revision 1.1.1.11
retrieving revision 1.1.1.12
diff -u -r1.1.1.11 -r1.1.1.12
--- qvaluelist.doc	9 Apr 2005 10:35:15 -0000	1.1.1.11
+++ qvaluelist.doc	30 Sep 2005 15:26:52 -0000	1.1.1.12
@@ -1,1197 +1,1197 @@
-/****************************************************************************
-** 
-**
-** QValueList and QValueListIterator class documentation
-**
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
[...2363 lines suppressed...]
+    \sa QValueListIterator ConstIterator
+*/
+
+/*!
+    \enum QValueList::ConstIterator
+
+    This iterator is an instantiation of QValueListConstIterator for
+    the same type as this QValueList. In other words, if you
+    instantiate QValueList<int>, ConstIterator is a
+    QValueListConstIterator<int>. Several member function use it, such
+    as QValueList::begin(), which returns an iterator pointing to the
+    first item in the list.
+
+    Functionally, this is almost the same as Iterator. The only
+    difference is you cannot use ConstIterator for non-const
+    operations, and that the compiler can often generate better code
+    if you use ConstIterator.
+
+    \sa QValueListIterator Iterator
+*/

Index: qvaluestack.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qvaluestack.doc,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.6
diff -u -r1.1.1.5 -r1.1.1.6
--- qvaluestack.doc	14 Jan 2003 14:35:14 -0000	1.1.1.5
+++ qvaluestack.doc	30 Sep 2005 15:26:52 -0000	1.1.1.6
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** QValueStack class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qvaluevector.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qvaluevector.doc,v
retrieving revision 1.1.1.4
retrieving revision 1.1.1.5
diff -u -r1.1.1.4 -r1.1.1.5
--- qvaluevector.doc	27 Aug 2004 21:24:13 -0000	1.1.1.4
+++ qvaluevector.doc	30 Sep 2005 15:26:52 -0000	1.1.1.5
@@ -2,7 +2,7 @@
 **
 ** QValueVector class documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qvfb.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qvfb.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- qvfb.doc	27 Aug 2004 21:24:13 -0000	1.1.1.6
+++ qvfb.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Qt/Embedded Virtual Framebuffer
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: qws.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/qws.doc,v
retrieving revision 1.1.1.10
retrieving revision 1.1.1.11
diff -u -r1.1.1.10 -r1.1.1.11
--- qws.doc	9 Apr 2005 10:35:15 -0000	1.1.1.10
+++ qws.doc	30 Sep 2005 15:26:52 -0000	1.1.1.11
@@ -1,672 +1,672 @@
-/****************************************************************************
-** 
-**
-** Qt/Embedded (Qt on QWS) documentation
-**
-** Copyright (C) 2000-2003 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
[...1313 lines suppressed...]
+\endcode
+then, run a VNC client pointing at the machine that is running your
+application. For example, using the X11 VNC client to view the
+application from the same machine:
+\code
+    vncviewer localhost:0
+\endcode
+
+By default, Qt/Embedded will create a 640 by 480 pixel display. You
+can change this by setting the \c QWS_SIZE environment variable to
+another size, e.g. \c QWS_SIZE=240x320.
+
+VNC clients are available for a vast array of display systems: X11,
+Windows, Amiga, DOS, VMS, and dozens of others.
+
+The \link emb-qvfb.html Qt Virtual Framebuffer \endlink is an alternative
+technique. It uses shared memory and thus is much faster and smoother, but
+it does not operate over a network.
+
+*/

Index: session.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/session.doc,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.6
diff -u -r1.1.1.5 -r1.1.1.6
--- session.doc	14 Jan 2003 14:35:14 -0000	1.1.1.5
+++ session.doc	30 Sep 2005 15:26:52 -0000	1.1.1.6
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Qt session management overview documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: shclass.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/shclass.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- shclass.doc	1 Oct 2003 07:17:06 -0000	1.1.1.6
+++ shclass.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Qt Shared Classes Documentation
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: signalsandslots.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/signalsandslots.doc,v
retrieving revision 1.1.1.7
retrieving revision 1.1.1.8
diff -u -r1.1.1.7 -r1.1.1.8
--- signalsandslots.doc	1 Oct 2003 07:17:06 -0000	1.1.1.7
+++ signalsandslots.doc	30 Sep 2005 15:26:52 -0000	1.1.1.8
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Explanation of moc and the meta object system
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: sql-driver.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/sql-driver.doc,v
retrieving revision 1.1.1.8
retrieving revision 1.1.1.9
diff -u -r1.1.1.8 -r1.1.1.9
--- sql-driver.doc	9 Apr 2005 10:35:15 -0000	1.1.1.8
+++ sql-driver.doc	30 Sep 2005 15:26:52 -0000	1.1.1.9
@@ -1,728 +1,729 @@
-/****************************************************************************
-**
-** Documentation for sql driver programming
-**
-** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
[...1426 lines suppressed...]
+    int         numRowsAffected() { return 0; }
+};
+
+class QNullDriver : public QSqlDriver
+{
+public:
+    QNullDriver(): QSqlDriver() {}
+    ~QNullDriver() {}
+    bool    hasFeature( DriverFeature ) const { return FALSE; }
+    bool    open( const QString&,
+                  const QString&,
+                  const QString&,
+                  const QString&,
+                  int ) { return FALSE; }
+    void    close() {}
+    QSqlQuery createQuery() const { return QSqlQuery( new QNullResult( this ) ); }
+};
+\endcode
+
+*/

Index: sql.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/sql.doc,v
retrieving revision 1.1.1.10
retrieving revision 1.1.1.11
diff -u -r1.1.1.10 -r1.1.1.11
--- sql.doc	9 Apr 2005 10:35:15 -0000	1.1.1.10
+++ sql.doc	30 Sep 2005 15:26:52 -0000	1.1.1.11
@@ -1,1348 +1,1348 @@
-/****************************************************************************
-** 
-**
-** Documentation for sql programming
-**
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
[...2665 lines suppressed...]
+create table status (id integer primary key, name char(30))
+
+create table creditors (id integer primary key, forename char(40),
+			surname char(40), city char(30))
+
+create table prices (id integer primary key, name char(40), price float)
+
+create table invoiceitem (id integer primary key, 
+			  pricesid integer, quantity integer,
+			  paiddate date)
+\endcode 
+
+A sequence was used in the calculateField() example above. Note that
+sequences are not supported in all databases.
+
+\code
+create sequence invoiceitem_seq
+\endcode
+
+*/

Index: table.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/table.doc,v
retrieving revision 1.1.1.7
retrieving revision 1.1.1.8
diff -u -r1.1.1.7 -r1.1.1.8
--- table.doc	27 Aug 2004 21:24:13 -0000	1.1.1.7
+++ table.doc	30 Sep 2005 15:26:52 -0000	1.1.1.8
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Documentation for table programming
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: threads.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/threads.doc,v
retrieving revision 1.1.1.7
retrieving revision 1.1.1.8
diff -u -r1.1.1.7 -r1.1.1.8
--- threads.doc	27 Aug 2004 21:24:13 -0000	1.1.1.7
+++ threads.doc	30 Sep 2005 15:26:52 -0000	1.1.1.8
@@ -3,7 +3,7 @@
 **
 ** Qt thread support
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: tutorial.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/tutorial.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- tutorial.doc	1 Oct 2003 07:17:07 -0000	1.1.1.6
+++ tutorial.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Tutorial
 **
-** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS. All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: unicode.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/unicode.doc,v
retrieving revision 1.1.1.7
retrieving revision 1.1.1.8
diff -u -r1.1.1.7 -r1.1.1.8
--- unicode.doc	1 Oct 2003 07:17:07 -0000	1.1.1.7
+++ unicode.doc	30 Sep 2005 15:26:52 -0000	1.1.1.8
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Documentation of Unicode support in Qt.
 **
-** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: winsystem.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/winsystem.doc,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- winsystem.doc	27 Aug 2004 21:24:13 -0000	1.1.1.6
+++ winsystem.doc	30 Sep 2005 15:26:52 -0000	1.1.1.7
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Windowsystem-specific pages
 **
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: xml-sax-features-walkthrough.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/xml-sax-features-walkthrough.doc,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.6
diff -u -r1.1.1.5 -r1.1.1.6
--- xml-sax-features-walkthrough.doc	14 Jan 2003 14:35:14 -0000	1.1.1.5
+++ xml-sax-features-walkthrough.doc	30 Sep 2005 15:26:52 -0000	1.1.1.6
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Documentation on the sax interface of the xml module
 **
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: xml-sax-walkthrough.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/xml-sax-walkthrough.doc,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.6
diff -u -r1.1.1.5 -r1.1.1.6
--- xml-sax-walkthrough.doc	14 Jan 2003 14:35:14 -0000	1.1.1.5
+++ xml-sax-walkthrough.doc	30 Sep 2005 15:26:52 -0000	1.1.1.6
@@ -1,9 +1,9 @@
 /****************************************************************************
-** 
+** $Id$
 **
 ** Documentation on the sax interface of the xml module
 **
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qt GUI Toolkit.
 **

Index: xml.doc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/xml.doc,v
retrieving revision 1.1.1.7
retrieving revision 1.1.1.8
diff -u -r1.1.1.7 -r1.1.1.8
--- xml.doc	27 Aug 2004 21:24:13 -0000	1.1.1.7
+++ xml.doc	30 Sep 2005 15:26:52 -0000	1.1.1.8
@@ -1,9 +1,9 @@
 /*************************************************...
 
[truncated message content]

[Kde-cygwin-cvs] CVS: qt-3/examples/qwerty ANSI_X3.110-1983.txt,1.1.1.5,1.1.1.6 IBM277.txt,1.1.1.1,1.1.1.2 eucJP.txt,1.1.1.5,1.1.1.6 koi8.txt,1.1.1.5,1.1.1.6 latin1.txt,1.1.1.5,1.1.1.6

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

Update of /cvsroot/kde-cygwin/qt-3/examples/qwerty
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13083/examples/qwerty

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	ANSI_X3.110-1983.txt IBM277.txt eucJP.txt koi8.txt latin1.txt 
Log Message:


Index: ANSI_X3.110-1983.txt
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/examples/qwerty/ANSI_X3.110-1983.txt,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.6
diff -u -r1.1.1.5 -r1.1.1.6
--- ANSI_X3.110-1983.txt	22 Sep 2005 13:00:03 -0000	1.1.1.5
+++ ANSI_X3.110-1983.txt	30 Sep 2005 15:26:52 -0000	1.1.1.6
@@ -1,7 +1,7 @@
-ABCDE
-ÂaÃaÄaÈaÊañËcÁeÂeÃeÈeÁiÂiÃiÈióÄnÁoÂoÃoÄoÈoùÁuÂa
-?????
-?????
-?????
-??????
+ABCDE
+ÂaÃaÄaÈaÊañËcÁeÂeÃeÈeÁiÂiÃiÈióÄnÁoÂoÃoÄoÈoùÁuÂa
+?????
+?????
+?????
+??????
 ??????
\ No newline at end of file

Index: IBM277.txt
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/examples/qwerty/IBM277.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.2
diff -u -r1.1.1.1 -r1.1.1.2
--- IBM277.txt	18 Apr 2002 19:45:39 -0000	1.1.1.1
+++ IBM277.txt	30 Sep 2005 15:26:52 -0000	1.1.1.2
@@ -1 +1,7 @@
-ÁÂÃÄÅ
%EBFCÐÀHTQRSXUVWŒIÍÎËÏÌjÝE
%?????
%?????
%?????
%??????
%??????
\ No newline at end of file
+ÁÂÃÄÅ
+%EBFCÐÀHTQRSXUVWŒIÍÎËÏÌjÝE
+%?????
+%?????
+%?????
+%??????
+%??????
\ No newline at end of file

Index: eucJP.txt
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/examples/qwerty/eucJP.txt,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.6
diff -u -r1.1.1.5 -r1.1.1.6
--- eucJP.txt	22 Sep 2005 13:00:03 -0000	1.1.1.5
+++ eucJP.txt	30 Sep 2005 15:26:52 -0000	1.1.1.6
@@ -1,7 +1,7 @@
-ABCDE
-¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢
-¤¢¤¤¤¦¤¨¤ª
-¤«¤­¤¯¤±¤³
-¤µ¤·¤¹¤»¤½
-§«§¸§µ§¬§¦§¯
+ABCDE
+¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢
+¤¢¤¤¤¦¤¨¤ª
+¤«¤­¤¯¤±¤³
+¤µ¤·¤¹¤»¤½
+§«§¸§µ§¬§¦§¯
 §Û§è§å§Ü§Ö§ß
\ No newline at end of file

Index: koi8.txt
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/examples/qwerty/koi8.txt,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.6
diff -u -r1.1.1.5 -r1.1.1.6
--- koi8.txt	22 Sep 2005 13:00:03 -0000	1.1.1.5
+++ koi8.txt	30 Sep 2005 15:26:52 -0000	1.1.1.6
@@ -1,7 +1,7 @@
-ABCDE
-¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤
-¤¤¤¤¤
-¤¤¤¤¤
-¤¤¤¤¤
-êãõëåî
+ABCDE
+¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤
+¤¤¤¤¤
+¤¤¤¤¤
+¤¤¤¤¤
+êãõëåî
 ÊÃÕËÅÎ
\ No newline at end of file

Index: latin1.txt
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/examples/qwerty/latin1.txt,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.6
diff -u -r1.1.1.5 -r1.1.1.6
--- latin1.txt	22 Sep 2005 13:00:03 -0000	1.1.1.5
+++ latin1.txt	30 Sep 2005 15:26:52 -0000	1.1.1.6
@@ -1,7 +1,7 @@
-ABCDE
-áâãäåæçèéêëìíîïðñòóôõöøùá
-?????
-?????
-?????
-??????
+ABCDE
+áâãäåæçèéêëìíîïðñòóôõöøùá
+?????
+?????
+?????
+??????
 ??????
\ No newline at end of file

[Kde-cygwin-cvs] CVS: qt-3/src/3rdparty/zlib Makefile,NONE,1.2.2.2

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

Update of /cvsroot/kde-cygwin/qt-3/src/3rdparty/zlib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13083/src/3rdparty/zlib

Added Files:
      Tag: QT_WIN32_3_3_BRANCH
	Makefile 
Log Message:


--- NEW FILE: Makefile ---
# Makefile for zlib
# Copyright (C) 1995-2003 Jean-loup Gailly.
# For conditions of distribution and use, see copyright notice in zlib.h

# To compile and test, type:
#    ./configure; make test
# The call of configure is optional if you don't have special requirements
# If you wish to build zlib as a shared library, use: ./configure -s

# To use the asm code, type:
#    cp contrib/asm?86/match.S ./match.S
#    make LOC=-DASMV OBJA=match.o

# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
#    make install
# To install in $HOME instead of /usr/local, use:
#    make install prefix=$HOME

CC=cc

CFLAGS=-O
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
#CFLAGS=-g -DDEBUG
#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
#           -Wstrict-prototypes -Wmissing-prototypes

LDFLAGS=libz.a
LDSHARED=$(CC)
CPP=$(CC) -E

LIBS=libz.a
SHAREDLIB=libz.so
SHAREDLIBV=libz.so.1.2.2
SHAREDLIBM=libz.so.1

AR=ar rc
RANLIB=ranlib
TAR=tar
SHELL=/bin/sh
EXE=

prefix = /usr/local
exec_prefix = ${prefix}
libdir = ${exec_prefix}/lib
includedir = ${prefix}/include
mandir = ${prefix}/share/man
man3dir = ${mandir}/man3

OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
       zutil.o inflate.o infback.o inftrees.o inffast.o

OBJA =
# to use the asm code: make OBJA=match.o

TEST_OBJS = example.o minigzip.o

all: example$(EXE) minigzip$(EXE)

check: test
test: all
	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
	echo hello world | ./minigzip | ./minigzip -d || \
	  echo '		*** minigzip test FAILED ***' ; \
	if ./example; then \
	  echo '		*** zlib test OK ***'; \
	else \
	  echo '		*** zlib test FAILED ***'; \
	fi

libz.a: $(OBJS) $(OBJA)
	$(AR) $@ $(OBJS) $(OBJA)
	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1

match.o: match.S
	$(CPP) match.S > _match.s
	$(CC) -c _match.s
	mv _match.o match.o
	rm -f _match.s

$(SHAREDLIBV): $(OBJS)
	$(LDSHARED) -o $@ $(OBJS)
	rm -f $(SHAREDLIB) $(SHAREDLIBM)
	ln -s $@ $(SHAREDLIB)
	ln -s $@ $(SHAREDLIBM)

example$(EXE): example.o $(LIBS)
	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)

minigzip$(EXE): minigzip.o $(LIBS)
	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)

install: $(LIBS)
	-@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
	-@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi
	-@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi
	-@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi
	cp zlib.h zconf.h $(includedir)
	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
	cp $(LIBS) $(libdir)
	cd $(libdir); chmod 755 $(LIBS)
	-@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
	cd $(libdir); if test -f $(SHAREDLIBV); then \
	  rm -f $(SHAREDLIB) $(SHAREDLIBM); \
	  ln -s $(SHAREDLIBV) $(SHAREDLIB); \
	  ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
	  (ldconfig || true)  >/dev/null 2>&1; \
	fi
	cp zlib.3 $(man3dir)
	chmod 644 $(man3dir)/zlib.3
# The ranlib in install is needed on NeXTSTEP which checks file times
# ldconfig is for Linux

uninstall:
	cd $(includedir); \
	cd $(libdir); rm -f libz.a; \
	if test -f $(SHAREDLIBV); then \
	  rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
	fi
	cd $(man3dir); rm -f zlib.3

mostlyclean: clean
clean:
	rm -f *.o *~ example$(EXE) minigzip$(EXE) \
	   libz.* foo.gz so_locations \
	   _match.s maketree contrib/infback9/*.o

maintainer-clean: distclean
distclean: clean
	cp -p Makefile.in Makefile
	cp -p zconf.in.h zconf.h
	rm -f .DS_Store

tags:
	etags *.[ch]

depend:
	makedepend -- $(CFLAGS) -- *.[ch]

# DO NOT DELETE THIS LINE -- make depend depends on it.

adler32.o: zlib.h zconf.h
compress.o: zlib.h zconf.h
crc32.o: crc32.h zlib.h zconf.h
deflate.o: deflate.h zutil.h zlib.h zconf.h
example.o: zlib.h zconf.h
gzio.o: zutil.h zlib.h zconf.h
inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
inftrees.o: zutil.h zlib.h zconf.h inftrees.h
minigzip.o: zlib.h zconf.h
trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
uncompr.o: zlib.h zconf.h
zutil.o: zutil.h zlib.h zconf.h