? .qtwinconfig
? qfiledialog_win_cpp.diff
? qtmain.txt
? xcompile.diff
? bin/qt3.dll
? examples/helpdemo/helpdemobase.cpp
? examples/helpdemo/helpdemobase.h
? examples/toplevel/options.cpp
? examples/toplevel/options.h
? extensions/nsplugin/examples/grapher/npgrapher.prl
? extensions/nsplugin/examples/trivial/nptrivial.prl
? lib/qt.prl
? misc/configure/Makefile
? misc/configure/tmp
? misc/link_includes/Makefile
? misc/link_includes/tmp
? misc/progress/Makefile
? plugins/accessible
? plugins/src/sqldrivers/ibase/obj
? plugins/src/sqldrivers/mysql/obj
? plugins/src/sqldrivers/odbc/obj
? plugins/src/sqldrivers/psql/obj
? plugins/src/sqldrivers/sqlite/obj
? plugins/src/styles/cde/obj
? plugins/src/styles/compact/obj
? plugins/src/styles/motif/obj
? plugins/src/styles/motifplus/obj
? plugins/src/styles/platinum/obj
? plugins/src/styles/sgi/obj
? plugins/src/styles/windows/obj
? qmake/object_ld_script
? qmake/tmp
? src/Makefile.qtmain
Index: Makefile
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/Makefile,v
retrieving revision 1.1.1.12
diff -u -p -r1.1.1.12 Makefile
--- Makefile	9 Apr 2005 10:14:11 -0000	1.1.1.12
+++ Makefile	21 Apr 2005 22:39:23 -0000
@@ -86,10 +86,6 @@ distclean clean uiclean mocclean:
 	cd plugins/src && $(MAKE) $@
 	cd examples && $(MAKE) $@
 	cd config.tests/unix/stl && $(MAKE) $@
-	cd config.tests/unix/endian && $(MAKE) distclean
-	cd config.tests/unix/ipv6 && $(MAKE) distclean
-	cd config.tests/unix/largefile && $(MAKE) distclean
-	cd config.tests/unix/ptrsize && $(MAKE) distclean
 	[ ! -f config.tests/x11/notype/Makefile ] || cd config.tests/x11/notype && $(MAKE) $@
 	cd qmake && $(MAKE) $@
 
@@ -102,10 +98,6 @@ confclean:
 	cd plugins/src && $(MAKE) distclean
 	cd examples && $(MAKE) distclean
 	cd config.tests/unix/stl && $(MAKE) distclean
-	cd config.tests/unix/endian && $(MAKE) distclean
-	cd config.tests/unix/ipv6 && $(MAKE) distclean
-	cd config.tests/unix/largefile && $(MAKE) distclean
-	cd config.tests/unix/ptrsize && $(MAKE) distclean
 	[ ! -f config.tests/x11/notype/Makefile ] || cd config.tests/x11/notype && $(MAKE) distclean
 
 .qmake.cache:
Index: mkspecs/win32-g++-cross/qmake.conf
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/win32-g++-cross/Attic/qmake.conf,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 qmake.conf
--- mkspecs/win32-g++-cross/qmake.conf	23 Mar 2005 16:46:44 -0000	1.1.2.1
+++ mkspecs/win32-g++-cross/qmake.conf	21 Apr 2005 22:39:36 -0000
@@ -15,7 +15,7 @@ exists( $(QTDIR)/.qtwinconfig ) {
 	include( $(QTDIR)/.qtwinconfig )
 }
 
-QMAKE_CC		= ccache i586-mingw32msvc-gcc
+QMAKE_CC		= i386-mingw32-gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= byacc
@@ -33,7 +33,7 @@ QMAKE_CFLAGS_RTTI_OFF	= -fno-rtti
 QMAKE_CFLAGS_EXCEPTIONS_ON = -fexceptions
 QMAKE_CFLAGS_EXCEPTIONS_OFF = -fno-exceptions
 
-QMAKE_CXX		= ccache i586-mingw32msvc-g++
+QMAKE_CXX		= i386-mingw32-g++
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
 QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
 QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
@@ -56,7 +56,7 @@ QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(
 QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
-QMAKE_LINK		= i586-mingw32msvc-g++
+QMAKE_LINK		= i386-mingw32-g++
 QMAKE_LFLAGS		= -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
 QMAKE_LFLAGS_RELEASE	= -Wl,-s
 QMAKE_LFLAGS_DEBUG	=
@@ -84,8 +84,8 @@ QMAKE_UIC		= uic
 # QMAKE_IDC		= $(QTDIR)/bin/idc.exe
 
 QMAKE_IDL		= midl
-QMAKE_LIB		= i586-mingw32msvc-ar -ru
-QMAKE_RC		= i586-mingw32msvc-windres
+QMAKE_LIB		= i386-mingw32-ar -ru
+QMAKE_RC		= i386-mingw32-windres
 
 QMAKE_ZIP		= zip -r -9
 
@@ -93,7 +93,7 @@ QMAKE_COPY		= cp -f
 QMAKE_MOVE		= mv -f
 QMAKE_DEL_FILE		= rm -f
 QMAKE_DEL_DIR		= rmdir
-QMAKE_STRIP		= i586-mingw32msvc-strip
+QMAKE_STRIP		= i386-mingw32-strip
 QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
 QMAKE_CHK_DIR_EXISTS	= test -d
 QMAKE_MKDIR		= mkdir -p
Index: src/dialogs/qfiledialog_win.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/dialogs/Attic/qfiledialog_win.cpp,v
retrieving revision 1.1.2.1.4.13
diff -u -p -r1.1.2.1.4.13 qfiledialog_win.cpp
--- src/dialogs/qfiledialog_win.cpp	21 Apr 2005 15:45:28 -0000	1.1.2.1.4.13
+++ src/dialogs/qfiledialog_win.cpp	21 Apr 2005 22:39:39 -0000
@@ -60,7 +60,7 @@ QCString inline qt_win_filename( const Q
     return QFile::encodeName( filename.replace( '/', '\\' ) );
 }
 
-QString inline &slashify( const QString &data )
+QString inline slashify( const QString &data )
 {
     QString filename = data;
     // now it really works - Perl is simply better ;)
Index: tools/designer/app/app.pro
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/tools/designer/app/app.pro,v
retrieving revision 1.1.1.3
diff -u -p -r1.1.1.3 app.pro
--- tools/designer/app/app.pro	27 Aug 2004 21:24:45 -0000	1.1.1.3
+++ tools/designer/app/app.pro	21 Apr 2005 22:39:41 -0000
@@ -11,6 +11,8 @@ win32 {
    RC_FILE	= designer.rc
    win32-g++ {
 	TARGETDEPS += $$QT_BUILD_TREE/lib/libdesignercore.a
+   } win32-g++-cross {
+        TARGETDEPS += $$QT_BUILD_TREE/lib/libdesignercore.a
    } else {
 	TARGETDEPS += $$QT_BUILD_TREE/lib/designercore.lib
    }
