diff -uNr qt-2.3.5-opiecvs/configs/linux-sla300-g++-shared qt-2.3.5-k4/configs/linux-sla300-g++-shared
--- qt-2.3.5-opiecvs/configs/linux-sla300-g++-shared	Thu Jan  1 09:00:00 1970
+++ qt-2.3.5-k4/configs/linux-sla300-g++-shared	Thu May 29 20:22:37 2003
@@ -0,0 +1,102 @@
+# Compiling
+INTERFACE_DECL_PATH 	= .
+ARMTOOL_DIR             = /opt/Embedix/tools/bin/
+RUNTIME_QTDIR           = /home/QtPalmtop
+RUNTIME_QPEDIR          = /home/QtPalmtop
+
+SYSCONF_CXX		= $(ARMTOOL_DIR)arm-linux-g++
+SYSCONF_CC		= $(ARMTOOL_DIR)arm-linux-gcc
+DASHCROSS		= -arm
+
+# Compiling with support libraries
+SYSCONF_CXXFLAGS_X11	= 
+SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
+SYSCONF_CXXFLAGS_QTOPIA	= -I$(QPEDIR)/include
+SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
+
+# Compiling YACC output
+SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
+
+# Linking with support libraries
+SYSCONF_RPATH_X11	= 
+SYSCONF_RPATH_QT	= -Wl,-rpath,$(RUNTIME_QTDIR)/lib
+SYSCONF_RPATH_QTOPIA	= -Wl,-rpath,$(RUNTIME_QPEDIR)/lib
+SYSCONF_RPATH_OPENGL	= -Wl,-rpath,/usr/X11R6/lib
+
+# Linking with support libraries
+# X11
+SYSCONF_LFLAGS_X11	= 
+SYSCONF_LIBS_X11	= 
+# Qt, Qt+OpenGL
+SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
+SYSCONF_LFLAGS_QTOPIA	= -L$(QPEDIR)/lib
+SYSCONF_LIBS_QT		= -lqte$(QT_THREAD_SUFFIX)
+SYSCONF_LIBS_QT_OPENGL	= 
+SYSCONF_LIBS_QTOPIA	= -lqtopia
+# OpenGL
+SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
+SYSCONF_LIBS_OPENGL	= 
+# Yacc
+SYSCONF_LIBS_YACC	= 
+
+# Linking applications
+SYSCONF_LINK		= $(ARMTOOL_DIR)arm-linux-gcc
+SYSCONF_LFLAGS		= 
+SYSCONF_LIBS		= 
+
+# Link flags for shared objects
+SYSCONF_LFLAGS_SHOBJ	= -shared
+
+# Flags for threading
+SYSCONF_CFLAGS_THREAD	= -D_REENTRANT
+SYSCONF_CXXFLAGS_THREAD	= -D_REENTRANT
+SYSCONF_LFLAGS_THREAD	= 
+SYSCONF_LIBS_THREAD	=  -lpthread
+
+# Meta-object compiler
+SYSCONF_MOC		= $(QTDIR)/bin/moc
+
+# UI compiler
+SYSCONF_UIC		= $(QTDIR)/bin/uic
+
+# Linking shared libraries
+#   - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2
+#   - Place target in $(DESTDIR) - which has a trailing /
+#   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
+#
+SYSCONF_LINK_SHLIB	= $(ARMTOOL_DIR)arm-linux-gcc
+SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
+SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
+				     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
+				     $(OBJECTS) $(OBJMOC) $(LIBS) && \
+				 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
+				 cd $(DESTDIR) && \
+				 rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
+				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
+				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
+				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
+
+# Linking static libraries
+#   - Build the $(TARGET) library, eg. lib$(TARGET).a
+#   - Place target in $(DESTDIR) - which has a trailing /
+#
+SYSCONF_AR		= $(ARMTOOL_DIR)arm-linux-ar cqs
+SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
+SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+# Compiling application source
+SYSCONF_CXXFLAGS	= -pipe -DQT_QWS_SL5XXX -DQT_QWS_SLA300 -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -O2 -Wall -W -DNO_DEBUG
+SYSCONF_CFLAGS		= -pipe -O2 -Wall -W
+# Default link type (static linking is still be used where required)
+SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
+SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)
+# Compiling library source
+SYSCONF_CXXFLAGS_LIB	= -fPIC
+SYSCONF_CFLAGS_LIB	= -fPIC
+# Compiling shared-object source
+SYSCONF_CXXFLAGS_SHOBJ	= -fPIC
+SYSCONF_CFLAGS_SHOBJ	= -fPIC
+# Linking Qt
+SYSCONF_LIBS_QTLIB	= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT)
+# Linking Qt applications
+SYSCONF_LIBS_QTAPP	= 
diff -uNr qt-2.3.5-opiecvs/include/qconfig.h qt-2.3.5-k4/include/qconfig.h
--- qt-2.3.5-opiecvs/include/qconfig.h	Fri Jan 26 22:43:06 2001
+++ qt-2.3.5-k4/include/qconfig.h	Thu May 29 20:22:37 2003
@@ -1,3 +1,26 @@
+// Copied from qconfig-qpe.h
+/**********************************************************************
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+**
+** This file is part of Qtopia Environment.
+**
+** 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.
+**
+** 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/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+#ifndef QT_H
+#endif // QT_H
+
 // Empty leaves all features enabled.  See doc/html/features.html for choices.
 
 // Note that disabling some features will produce a libqt that is not
@@ -8,3 +31,76 @@
 #ifndef QT_DLL
 #define QT_DLL // Internal
 #endif
+
+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_EBX) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLA300)
+# define QT_NO_QWS_CURSOR
+# define QT_NO_QWS_MOUSE_AUTO
+#endif
+#ifndef QT_NO_CODECS
+// #define QT_NO_CODECS
+#endif
+#define QT_NO_UNICODETABLES
+//#define QT_NO_IMAGEIO_BMP
+#define QT_NO_IMAGEIO_PPM
+//#define QT_NO_ASYNC_IO
+//#define QT_NO_ASYNC_IMAGE_IO
+// #define QT_NO_FREETYPE
+#define QT_NO_BDF
+//#define QT_NO_FONTDATABASE
+#define QT_NO_DRAGANDDROP
+//#define QT_NO_CLIPBOARD
+#define QT_NO_PROPERTIES
+#define QT_NO_NETWORKPROTOCOL
+
+#define QT_NO_IMAGE_TEXT
+
+//#define QT_NO_TOOLTIP
+#define QT_NO_COLORNAMES
+#define QT_NO_TRANSFORMATIONS
+#define QT_NO_TRANSLATION_BUILDER
+#define QT_NO_COMPLEXTEXT
+#define QT_NO_PRINTER
+#define QT_NO_PICTURE
+//#define QT_NO_ICONVIEW
+#define QT_NO_DIAL
+#define QT_NO_SIZEGRIP
+#define QT_NO_WORKSPACE
+//#define QT_NO_TABLE
+//#define QT_NO_ACTION
+//#define QT_NO_SETTINGS
+#define QT_NO_STYLE_POCKETPC
+#ifndef QT_NO_STYLE_AQUA
+# define QT_NO_STYLE_AQUA
+#endif
+#define QT_NO_STYLE_MOTIF
+#define QT_NO_STYLE_PLATINUM
+#define QT_NO_FILEDIALOG
+#define QT_NO_FONTDIALOG
+#define QT_NO_PRINTDIALOG
+#define QT_NO_COLORDIALOG
+#define QT_NO_INPUTDIALOG
+//#define QT_NO_MESSAGEBOX
+#define QT_NO_PROGRESSDIALOG
+//#define QT_NO_TABDIALOG
+
+// #define QT_NO_WIZARD
+#ifndef _WS_WIN32_
+#define QT_NO_WIZARD_IMPL
+#endif
+
+#define QT_NO_EFFECTS
+//#define QT_NO_COMPONENT
+#define QT_NO_DOM
+#define QT_NO_SEMIMODAL
+//#define QT_NO_PROGRESSBAR
+#define QT_NO_SPLITTER
+
+#define QT_NO_QWS_SAVEFONTS
+//#define QT_NO_QWS_PROPERTIES
+
+#define QT_NO_QWS_BEOS_WM_STYLE
+#define QT_NO_QWS_KDE2_WM_STYLE
+#define QT_NO_QWS_KDE_WM_STYLE
+#define QT_NO_QWS_WINDOWS_WM_STYLE
+
+#define QT_NO_QMEMORYFILE
diff -uNr qt-2.3.5-opiecvs/include/qmodules.h qt-2.3.5-k4/include/qmodules.h
--- qt-2.3.5-opiecvs/include/qmodules.h	Sat Sep  1 00:00:56 2001
+++ qt-2.3.5-k4/include/qmodules.h	Thu May 29 20:22:37 2003
@@ -1,14 +1,11 @@
-#ifndef QT_H
-#endif // QT_H
-
+// These modules are licensed to you
 #define QT_MODULE_TOOLS
 #define QT_MODULE_KERNEL
 #define QT_MODULE_WIDGETS
 #define QT_MODULE_DIALOGS
-
 #define QT_MODULE_ICONVIEW
 #define QT_MODULE_WORKSPACE
-#define QT_MODULE_TABLE
+#define QT_MODULE_NETWORK
 #define QT_MODULE_CANVAS
+#define QT_MODULE_TABLE
 #define QT_MODULE_XML
-#define QT_MODULE_NETWORK
diff -uNr qt-2.3.5-opiecvs/src/kernel/qfontfactoryttf_qws.cpp qt-2.3.5-k4/src/kernel/qfontfactoryttf_qws.cpp
--- qt-2.3.5-opiecvs/src/kernel/qfontfactoryttf_qws.cpp	Wed Apr  2 10:26:52 2003
+++ qt-2.3.5-k4/src/kernel/qfontfactoryttf_qws.cpp	Thu May 29 20:22:37 2003
@@ -136,7 +136,7 @@
 		smooth ? ft_render_mode_normal : ft_render_mode_mono,
 		&origin, 1); // destroy original glyph
 	    if(err)
-		qWarning("Get bitmap error %d",err);
+		qWarning("Get bitmap error %d, 0x%04x, %d",err, index, smooth);
 	}
 
 	if ( !err ) {
diff -uNr qt-2.3.5-opiecvs/src/kernel/qgfxraster_qws.cpp qt-2.3.5-k4/src/kernel/qgfxraster_qws.cpp
--- qt-2.3.5-opiecvs/src/kernel/qgfxraster_qws.cpp	Wed Apr  2 10:26:52 2003
+++ qt-2.3.5-k4/src/kernel/qgfxraster_qws.cpp	Thu May 29 20:22:37 2003
@@ -4205,7 +4205,7 @@
     setAlphaType(IgnoreAlpha);
     if ( w <= 0 || h <= 0 || !ncliprect ) return;
     GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1))
-#ifdef QWS_EXPERIMENTAL_FASTPATH
+#if 0 // def QWS_EXPERIMENTAL_FASTPATH    !! this is crashing HancomWord on OZ !!
     // ### fix for 8bpp
     // This seems to be reliable now, at least for 16bpp
 
diff -uNr qt-2.3.5-opiecvs/src/kernel/qwsmouse_qws.cpp qt-2.3.5-k4/src/kernel/qwsmouse_qws.cpp
--- qt-2.3.5-opiecvs/src/kernel/qwsmouse_qws.cpp	Wed Apr  2 10:26:52 2003
+++ qt-2.3.5-k4/src/kernel/qwsmouse_qws.cpp	Thu May 29 20:22:37 2003
@@ -77,7 +77,18 @@
         unsigned short y;
         unsigned short pad;
 } TS_EVENT;
-#else
+#elif defined(QT_QWS_SLA300)
+typedef struct {
+        unsigned short pressure;
+                 short x;
+                 short y;
+        unsigned short pad;
+} TS_EVENT;
+#define QT_QWS_TP_SAMPLE_SIZE 1
+#define QT_QWS_TP_PRESSURE_THRESHOLD 1
+#define QT_QWS_TP_MOVE_LIMIT 50
+#define QT_QWS_TP_JITTER_LIMIT 2
+#else /* defined(QT_QWS_CUSTOM) && !defined(QT_QWS_SLA300) */
 typedef struct {
        long y;
        long x;
@@ -1301,7 +1312,10 @@
 	uchar *mb = mouseBuf+idx;
 	data = (TS_EVENT *) mb;
 	if(data->pressure >= QT_QWS_TP_PRESSURE_THRESHOLD) {
-#ifdef QT_QWS_SL5XXX
+
+#if QT_QWS_TP_SAMPLE_SIZE != 1
+
+#if defined(QT_QWS_SL5XXX) && !defined(QT_QWS_SLA300)
 	    samples[currSample] = QPoint( 1000 - data->x, data->y );
 #else
 	    samples[currSample] = QPoint( data->x, data->y );
@@ -1360,12 +1374,50 @@
 		currSample = 0;
 	    if ( lastSample >= samples.count() )
 		lastSample = 0;
+
+#else  /* QT_QWS_TP_SAMPLE_SIZE == 1 */
+
+#if defined(QT_QWS_SL5XXX) && !defined(QT_QWS_SLA300)
+	    mousePos = QPoint( 1000 - data->x, data->y );
+#else
+	    mousePos = QPoint( data->x, data->y );
+#endif
+# if defined(QT_QWS_IPAQ_RAW) || defined(QT_QWS_SL5XXX_RAW)
+            mousePos = transform( mousePos );
+# endif
+	    if(!waspressed)
+		oldmouse = mousePos;
+	    QPoint dp = mousePos - oldmouse;
+	    int dxSqr = dp.x() * dp.x();
+	    int dySqr = dp.y() * dp.y();
+	    if ( dxSqr + dySqr < (QT_QWS_TP_MOVE_LIMIT * QT_QWS_TP_MOVE_LIMIT) ) {
+		if ( waspressed ) {
+		    if ( (dxSqr + dySqr > (QT_QWS_TP_JITTER_LIMIT * QT_QWS_TP_JITTER_LIMIT) ) || skipCount > 2) {
+			emit mouseChanged(mousePos,Qt::LeftButton);
+			oldmouse = mousePos;
+			skipCount = 0;
+		    } else {
+			skipCount++;
+		    }
+		} else {
+		    emit mouseChanged(mousePos,Qt::LeftButton);
+		    oldmouse=mousePos;
+		    waspressed=true;
+		}
+	    }
+
+#endif /* QT_QWS_TP_SAMPLE_SIZE == 1 */
+
 	} else {
 	    currSample = 0;
 	    lastSample = 0;
 	    numSamples = 0;
 	    skipCount = 0;
+
+#if QT_QWS_TP_SAMPLE_SIZE != 1
 	    oldTotalMousePos = QPoint(0,0);
+#endif /* QT_QWS_TP_SAMPLE_SIZE != 1 */
+
 	    if ( waspressed ) {
 		emit mouseChanged(oldmouse,0);
 		oldmouse = QPoint( -100, -100 );
diff -uNr qt-2.3.5-opiecvs/src/tools/qconfig-qpe.h qt-2.3.5-k4/src/tools/qconfig-qpe.h
--- qt-2.3.5-opiecvs/src/tools/qconfig-qpe.h	Thu Jan  1 09:00:00 1970
+++ qt-2.3.5-k4/src/tools/qconfig-qpe.h	Thu May 29 20:22:37 2003
@@ -0,0 +1,105 @@
+/**********************************************************************
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+**
+** This file is part of Qtopia Environment.
+**
+** 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.
+**
+** 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/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+#ifndef QT_H
+#endif // QT_H
+
+// Empty leaves all features enabled.  See doc/html/features.html for choices.
+
+// Note that disabling some features will produce a libqt that is not
+// compatible with other libqt builds. Such modifications are only
+// supported on Qt/Embedded where reducing the library size is important
+// and where the application-suite is often a fixed set.
+
+#ifndef QT_DLL
+#define QT_DLL // Internal
+#endif
+
+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_EBX) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLA300)
+# define QT_NO_QWS_CURSOR
+# define QT_NO_QWS_MOUSE_AUTO
+#endif
+#ifndef QT_NO_CODECS
+// #define QT_NO_CODECS
+#endif
+#define QT_NO_UNICODETABLES
+//#define QT_NO_IMAGEIO_BMP
+#define QT_NO_IMAGEIO_PPM
+//#define QT_NO_ASYNC_IO
+//#define QT_NO_ASYNC_IMAGE_IO
+// #define QT_NO_FREETYPE
+#define QT_NO_BDF
+//#define QT_NO_FONTDATABASE
+#define QT_NO_DRAGANDDROP
+//#define QT_NO_CLIPBOARD
+#define QT_NO_PROPERTIES
+#define QT_NO_NETWORKPROTOCOL
+
+#define QT_NO_IMAGE_TEXT
+
+//#define QT_NO_TOOLTIP
+#define QT_NO_COLORNAMES
+#define QT_NO_TRANSFORMATIONS
+#define QT_NO_TRANSLATION_BUILDER
+#define QT_NO_COMPLEXTEXT
+#define QT_NO_PRINTER
+#define QT_NO_PICTURE
+//#define QT_NO_ICONVIEW
+#define QT_NO_DIAL
+#define QT_NO_SIZEGRIP
+#define QT_NO_WORKSPACE
+//#define QT_NO_TABLE
+//#define QT_NO_ACTION
+//#define QT_NO_SETTINGS
+#define QT_NO_STYLE_POCKETPC
+#ifndef QT_NO_STYLE_AQUA
+# define QT_NO_STYLE_AQUA
+#endif
+#define QT_NO_STYLE_MOTIF
+#define QT_NO_STYLE_PLATINUM
+#define QT_NO_FILEDIALOG
+#define QT_NO_FONTDIALOG
+#define QT_NO_PRINTDIALOG
+#define QT_NO_COLORDIALOG
+#define QT_NO_INPUTDIALOG
+//#define QT_NO_MESSAGEBOX
+#define QT_NO_PROGRESSDIALOG
+//#define QT_NO_TABDIALOG
+
+// #define QT_NO_WIZARD
+#ifndef _WS_WIN32_
+#define QT_NO_WIZARD_IMPL
+#endif
+
+#define QT_NO_EFFECTS
+//#define QT_NO_COMPONENT
+#define QT_NO_DOM
+#define QT_NO_SEMIMODAL
+//#define QT_NO_PROGRESSBAR
+#define QT_NO_SPLITTER
+
+#define QT_NO_QWS_SAVEFONTS
+//#define QT_NO_QWS_PROPERTIES
+
+#define QT_NO_QWS_BEOS_WM_STYLE
+#define QT_NO_QWS_KDE2_WM_STYLE
+#define QT_NO_QWS_KDE_WM_STYLE
+#define QT_NO_QWS_WINDOWS_WM_STYLE
+
+#define QT_NO_QMEMORYFILE
diff -uNr qt-2.3.5-opiecvs/src/tools/qconfig.h qt-2.3.5-k4/src/tools/qconfig.h
--- qt-2.3.5-opiecvs/src/tools/qconfig.h	Fri Jan 26 22:43:06 2001
+++ qt-2.3.5-k4/src/tools/qconfig.h	Thu May 29 20:22:37 2003
@@ -1,3 +1,26 @@
+// Copied from qconfig-qpe.h
+/**********************************************************************
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+**
+** This file is part of Qtopia Environment.
+**
+** 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.
+**
+** 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/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+#ifndef QT_H
+#endif // QT_H
+
 // Empty leaves all features enabled.  See doc/html/features.html for choices.
 
 // Note that disabling some features will produce a libqt that is not
@@ -8,3 +31,76 @@
 #ifndef QT_DLL
 #define QT_DLL // Internal
 #endif
+
+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_EBX) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLA300)
+# define QT_NO_QWS_CURSOR
+# define QT_NO_QWS_MOUSE_AUTO
+#endif
+#ifndef QT_NO_CODECS
+// #define QT_NO_CODECS
+#endif
+#define QT_NO_UNICODETABLES
+//#define QT_NO_IMAGEIO_BMP
+#define QT_NO_IMAGEIO_PPM
+//#define QT_NO_ASYNC_IO
+//#define QT_NO_ASYNC_IMAGE_IO
+// #define QT_NO_FREETYPE
+#define QT_NO_BDF
+//#define QT_NO_FONTDATABASE
+#define QT_NO_DRAGANDDROP
+//#define QT_NO_CLIPBOARD
+#define QT_NO_PROPERTIES
+#define QT_NO_NETWORKPROTOCOL
+
+#define QT_NO_IMAGE_TEXT
+
+//#define QT_NO_TOOLTIP
+#define QT_NO_COLORNAMES
+#define QT_NO_TRANSFORMATIONS
+#define QT_NO_TRANSLATION_BUILDER
+#define QT_NO_COMPLEXTEXT
+#define QT_NO_PRINTER
+#define QT_NO_PICTURE
+//#define QT_NO_ICONVIEW
+#define QT_NO_DIAL
+#define QT_NO_SIZEGRIP
+#define QT_NO_WORKSPACE
+//#define QT_NO_TABLE
+//#define QT_NO_ACTION
+//#define QT_NO_SETTINGS
+#define QT_NO_STYLE_POCKETPC
+#ifndef QT_NO_STYLE_AQUA
+# define QT_NO_STYLE_AQUA
+#endif
+#define QT_NO_STYLE_MOTIF
+#define QT_NO_STYLE_PLATINUM
+#define QT_NO_FILEDIALOG
+#define QT_NO_FONTDIALOG
+#define QT_NO_PRINTDIALOG
+#define QT_NO_COLORDIALOG
+#define QT_NO_INPUTDIALOG
+//#define QT_NO_MESSAGEBOX
+#define QT_NO_PROGRESSDIALOG
+//#define QT_NO_TABDIALOG
+
+// #define QT_NO_WIZARD
+#ifndef _WS_WIN32_
+#define QT_NO_WIZARD_IMPL
+#endif
+
+#define QT_NO_EFFECTS
+//#define QT_NO_COMPONENT
+#define QT_NO_DOM
+#define QT_NO_SEMIMODAL
+//#define QT_NO_PROGRESSBAR
+#define QT_NO_SPLITTER
+
+#define QT_NO_QWS_SAVEFONTS
+//#define QT_NO_QWS_PROPERTIES
+
+#define QT_NO_QWS_BEOS_WM_STYLE
+#define QT_NO_QWS_KDE2_WM_STYLE
+#define QT_NO_QWS_KDE_WM_STYLE
+#define QT_NO_QWS_WINDOWS_WM_STYLE
+
+#define QT_NO_QMEMORYFILE
diff -uNr qt-2.3.5-opiecvs/src/tools/qmodules.h qt-2.3.5-k4/src/tools/qmodules.h
--- qt-2.3.5-opiecvs/src/tools/qmodules.h	Sat Sep  1 00:00:56 2001
+++ qt-2.3.5-k4/src/tools/qmodules.h	Thu May 29 20:22:37 2003
@@ -1,14 +1,11 @@
-#ifndef QT_H
-#endif // QT_H
-
+// These modules are licensed to you
 #define QT_MODULE_TOOLS
 #define QT_MODULE_KERNEL
 #define QT_MODULE_WIDGETS
 #define QT_MODULE_DIALOGS
-
 #define QT_MODULE_ICONVIEW
 #define QT_MODULE_WORKSPACE
-#define QT_MODULE_TABLE
+#define QT_MODULE_NETWORK
 #define QT_MODULE_CANVAS
+#define QT_MODULE_TABLE
 #define QT_MODULE_XML
-#define QT_MODULE_NETWORK