upgrade qte-2.3.10 to final release (unbelievable)

BKrev: 4204cc4bLuww8nleMNsBd6CF_e7YoA

29 files changed, 0 insertions, 2078 deletions

diff --git a/packages/qte/qte-2.3.10-snapshot/kernel-keymap.patch b/packages/qte/qte-2.3.10-snapshot/kernel-keymap.patch
deleted file mode 100644
index 7b786eb294..0000000000
--- a/packages/qte/qte-2.3.10-snapshot/kernel-keymap.patch
+++ /dev/null
@@ -1,1038 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- qt-2.3.10-snapshot-20050131/src/kernel/qkeyboard_qws.cpp~kernel-keymap
-+++ qt-2.3.10-snapshot-20050131/src/kernel/qkeyboard_qws.cpp
-@@ -30,6 +30,42 @@
- **
- **********************************************************************/
- 
-+/****************************************************************************
-+**
-+** Keyboard Handling Redesign
-+** Copyright 2003, Chris Larson <kergoth@handhelds.org>
-+** Copyright 2004,2005 Holger Hans Peter Frether <freyther@handhelds.org>
-+**
-+** TODO: (key: . = in progress, x = completed)
-+**
-+** [.] Tty driver should load its initial keymap from the kernel,
-+**     thereby ensuring keymap consistency between X, console, and qt/e
-+**     [x] Read kernel keymappings.
-+**     [x] Read kernel keycode -> unicode map.
-+**     [x] Use them, along with the existing keyM, to push events up.
-+**     [x] Create a new table, from transformed keycode -> qt keycode, rather
-+**         than the existing raw keycode -> qt keycode.
-+**     [ ] Adapt handleKey to deal with keys that have no unicode value, such as
-+**         keypresses that are mapped to strings in the string table. (e.g. F keys)
-+** [x] Cursor orientation change based on display rotation should not
-+**     be bound to Ipaq or 5xxx, but instead as a runtime choice based
-+**     on whether or not we're using a Transformed display driver.
-+** [.] Double check that VT handling, particularly with regard to switching,
-+**     is handled properly.
-+** [ ] Add a generic means of dealing with additional (outside the realm of
-+**     ctrl, alt, shift, altgr) modifiers.  Also ensure a means of binding
-+**     a keypress/combination to a 'lock' of said additional modifiers.
-+**
-+** Holgers Todo
-+**
-+** [ ] Fix NumLock handling
-+** [ ] Fix Keypad handling
-+** [ ] Fix LED handling (LED_NUM and LED_CAP) don't seem to work
-+** [ ] Fix CTRL+ALT+H (somehow takes the function of CTRL+ALT+BACKSPACE)
-+**
-+**********************************************************************/
-+
-+
- #include "qwindowsystem_qws.h"
- #include "qwsutils_qws.h"
- #include "qgfx_qws.h"
-@@ -45,15 +81,18 @@
- #include <ctype.h>
- 
- #include <unistd.h>
--#ifdef _OS_LINUX_
--#include <linux/kd.h>
--#endif
-+#include <sys/wait.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <signal.h>
-+#include <termios.h>
-+#ifdef _OS_LINUX_
-+#include <linux/kd.h>
-+#include <linux/keyboard.h>
-+#endif
- 
- #ifdef QT_QWS_TIP2
- #include <qcopchannel_qws.h>
-@@ -135,17 +174,6 @@
- };
- #endif
- 
--#ifdef QT_QWS_SL5XXX
--#include <asm/sharp_char.h>
--#endif
--
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
--#define QT_QWS_AUTOREPEAT_MANUALLY
--#endif
--
--
--
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
- static int dir_keyrot = -1;
- 
- static int xform_dirkey(int key)
-@@ -169,7 +197,6 @@
-     int xf = qt_screen->transformOrientation() + dir_keyrot;
-     return (key-Qt::Key_Left+xf)%4+Qt::Key_Left;
- }
--#endif
- 
- #define VTSWITCHSIG SIGUSR2
- 
-@@ -300,11 +327,19 @@
-     {	Qt::Key_F35,		0xffff  , 0xffff  , 0xffff  }, // 21 light
-     {	Qt::Key_Escape,		0xffff  , 0xffff  , 0xffff  }, // 22
- 
-+#ifdef QT_QWS_SL6000
-     // Direction key code are for *UNROTATED* display.
--    {	Qt::Key_Up,		0xffff  , 0xffff  , 0xffff  }, // 23
--    {	Qt::Key_Right,		0xffff  , 0xffff  , 0xffff  }, // 24
--    {	Qt::Key_Left,		0xffff  , 0xffff  , 0xffff  }, // 25
--    {	Qt::Key_Down,		0xffff  , 0xffff  , 0xffff  }, // 26
-+    {  Qt::Key_Left,           0xffff  , 0xffff  , 0xffff  }, // 23
-+    {  Qt::Key_Up,             0xffff  , 0xffff  , 0xffff  }, // 24
-+    {  Qt::Key_Down,           0xffff  , 0xffff  , 0xffff  }, // 25
-+    {  Qt::Key_Right,          0xffff  , 0xffff  , 0xffff  }, // 26
-+#else
-+    // Direction key code are for *UNROTATED* display.
-+    {   Qt::Key_Up,             0xffff  , 0xffff  , 0xffff  }, // 23
-+    {   Qt::Key_Right,          0xffff  , 0xffff  , 0xffff  }, // 24
-+    {   Qt::Key_Left,           0xffff  , 0xffff  , 0xffff  }, // 25
-+    {   Qt::Key_Down,           0xffff  , 0xffff  , 0xffff  }, // 26
-+#endif
- 
-     {	Qt::Key_F33,		0xffff  , 0xffff  , 0xffff  }, // 27 OK
-     {	Qt::Key_F12,		0xffff  , 0xffff  , 0xffff  }, // 28 40 home
-@@ -369,7 +404,7 @@
-     {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 63
-     {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 64
-     {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 65
--    {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 66
-+    {   Qt::Key_F14,    0xffff  , 0xffff  , 0xffff  }, // 66
-     {	Qt::Key_Meta,		0xffff  , 0xffff  , 0xffff  }, // 67
-     {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 68
-     {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 69
-@@ -649,12 +684,61 @@
- public:
-     QWSTtyKeyboardHandler(const QString&);
-     virtual ~QWSTtyKeyboardHandler();
-+    void readKeyboardMap();
-+    void readUnicodeMap();
-+    void handleKey(unsigned char code);
- 
- private slots:
-     void readKeyboardData();
- 
- private:
-+    void modifyModifier( int map, int modify, bool release );
-+    void modifyLock( unsigned int lock, bool release );
-+    void handleExtra( unsigned int key, bool release );
-+    static void restoreLeds();
-+    static void toggleLed(unsigned int);
-+    int  map_to_modif ();
-+
-+private:
-     struct termios origTermData;
-+    unsigned short acm[E_TABSZ];
-+    struct KeyMap {
-+        enum ExtraKey{
-+            Key_AltGr    = 0x01ffff,
-+            Key_Console1  = 0x02ffff,
-+            Key_Console2  = 0x03ffff,
-+            Key_Console3  = 0x04ffff,
-+            Key_Console4  = 0x05ffff,
-+            Key_Console5  = 0x06ffff,
-+            Key_Console6  = 0x07ffff,
-+            Key_Console7  = 0x08ffff,
-+            Key_Console8  = 0x09ffff,
-+            Key_Console9  = 0x0affff,
-+            Key_Console10 = 0x0bffff,
-+            Key_Console11 = 0x0cffff,
-+            Key_Console12 = 0x0dffff,
-+            Key_NumLock   = 0x0effff,
-+            Key_ShiftLock = 0x0fffff,
-+            Key_CtrlLock  = 0x10ffff,
-+            Key_AltLock   = 0x11ffff,
-+            Key_AltGrLock = 0x12ffff
-+        };
-+
-+        KeyMap( Qt::Key _key = Qt::Key_unknown, unsigned short _code = 0 )
-+            : key( _key ), code( _code )
-+            {}
-+        KeyMap( ExtraKey _key,  unsigned short _code )
-+            : key( _key ), code( _code )
-+            {}
-+        unsigned int    key; // 16 Bit
-+        unsigned short code;
-+    };
-+
-+    KeyMap kernel_map[(1<<KG_CAPSSHIFT)][NR_KEYS];
-+    int current_map;
-+    int modifier;
-+    bool numlock  : 1;
-+    bool capslock : 1;
- };
- 
- 
-@@ -814,6 +898,7 @@
-     fn = FALSE;
- 
-     numLock = FALSE;
-+#if 0
-     sharp_kbdctl_modifstat  st;
-     int dev = ::open("/dev/sharp_kbdctl", O_RDWR);
-     if( dev >= 0 ) {
-@@ -825,6 +910,7 @@
- 	::close(dev);
-     }
- #endif
-+#endif
- #if defined(QT_QWS_IPAQ)
-     // iPAQ Action Key has ScanCode 0x60: 0x60|0x80 = 0xe0 == extended mode 1 !
-     ipaq_return_pressed = FALSE;
-@@ -954,7 +1040,7 @@
- 	    }
-     } else if ( extended == 2 ) {
- 	switch (code) {
--	case 0x1d: 
-+	case 0x1d:
- 	    return;
- 	case 0x45:
- 	    keyCode = Qt::Key_Pause;
-@@ -1199,7 +1285,7 @@
- 		unicode = '`';
- 	    } else
- #endif
--		
-+
- 		if (bCtrl)
- 		    unicode = currentKey->ctrl_unicode;
- 		else if (bCaps)
-@@ -1244,9 +1330,12 @@
- //
- // Tty keyboard
- //
-+#include "keyboard_linux_to_qt.h"
- 
- QWSTtyKeyboardHandler::QWSTtyKeyboardHandler(const QString& device)
-+    : current_map(0), modifier( 0 ), numlock( false ), capslock( false )
- {
-+    restoreLeds();
-     kbdFD=open(device.isEmpty() ? "/dev/tty0" : device.latin1(), O_RDWR | O_NDELAY, 0);
- 
-     if ( kbdFD >= 0 ) {
-@@ -1262,11 +1351,7 @@
- 	tcgetattr( kbdFD, &termdata );
- 
- #if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
--# ifdef QT_QWS_USE_KEYCODES
--	ioctl(kbdFD, KDSKBMODE, K_MEDIUMRAW);
--# else
--	ioctl(kbdFD, KDSKBMODE, K_RAW);
--# endif
-+        ioctl(kbdFD, KDSKBMODE, K_MEDIUMRAW);
- #endif
- 
- 	termdata.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP);
-@@ -1279,6 +1364,9 @@
- 	cfsetospeed(&termdata, 9600);
- 	tcsetattr(kbdFD, TCSANOW, &termdata);
- 
-+	readUnicodeMap();
-+	readKeyboardMap();
-+
- 	signal(VTSWITCHSIG, vtSwitchHandler);
- 
- #if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
-@@ -1300,6 +1388,7 @@
- 
- QWSTtyKeyboardHandler::~QWSTtyKeyboardHandler()
- {
-+    restoreLeds();
-     if (kbdFD >= 0)
-     {
- 
-@@ -1328,13 +1417,451 @@
- 	kbdFD = -1;
-     }
- }
-+void QWSTtyKeyboardHandler::readUnicodeMap()
-+{
-+    if (kbdFD < 0)
-+        return;
-+    if (ioctl(kbdFD,GIO_UNISCRNMAP,acm) != 0)
-+        return;
-+}
-+
-+
-+void QWSTtyKeyboardHandler::readKeyboardMap()
-+{
-+    struct kbentry  kbe;
-+    if (kbdFD < 0)
-+        return;
-+
-+    for (int map = 0; map < (1<<KG_CAPSSHIFT); ++map) {
-+        unsigned short kval;
-+        kbe.kb_table = map;
-+
-+        for (int key = 0; key < NR_KEYS; ++key) {
-+            kbe.kb_index = key;
-+
-+            if (ioctl(kbdFD, KDGKBENT, &kbe) != 0)
-+                continue;
-+
-+            if ((kbe.kb_value == K_HOLE) || (kbe.kb_value == K_NOSUCHMAP))
-+                continue;
-+
-+            kval = KVAL(kbe.kb_value);
-+            switch (KTYP(kbe.kb_value)) {
-+            /*
-+             * Map asciis and letters to Qt KeyCodes
-+             * via the map (0-255)
-+             */
-+            case KT_LETTER:
-+            case KT_LATIN:
-+                kernel_map[map][key] = KeyMap( linux_to_qt[kval], kval );
-+                break;
-+
-+            /*
-+             * Handle the F Keys and map them
-+             * to Qt
-+             */
-+            case KT_FN:
-+                if ( kval <= 19 )
-+                    kernel_map[map][key] = KeyMap( static_cast<Qt::Key>( Qt::Key_F1  + kval ), kval );
-+                else if ( kval >= 31 && kval <= 33)
-+                    kernel_map[map][key] = KeyMap( static_cast<Qt::Key>( Qt::Key_F21 + kval ), kval );
-+                else if ( kval >= 34 && kval <= 45 ) {
-+                    int off = kval-34;
-+                    kernel_map[map][key] = KeyMap(static_cast<KeyMap::ExtraKey>( KeyMap::Key_Console1+off ), kval );
-+                }else
-+                    switch(kbe.kb_value ) {
-+                    case K_INSERT:
-+                        kernel_map[map][key] = KeyMap( Qt::Key_Insert, kval );
-+                        break;
-+                    case K_REMOVE:
-+                        kernel_map[map][key] = KeyMap( Qt::Key_Delete, kval ); // right?
-+                        break;
-+                    case K_SELECT:
-+                        kernel_map[map][key] = KeyMap( Qt::Key_End , kval );
-+                        break;
-+                    case K_PGUP:
-+                        kernel_map[map][key] = KeyMap( Qt::Key_Prior, kval );
-+                        break;
-+                    case K_PGDN:
-+                        kernel_map[map][key] = KeyMap( Qt::Key_Next, kval );
-+                        break;
-+                    case K_MACRO:
-+                        kernel_map[map][key] = KeyMap( Qt::Key_Menu, kval );
-+                        break;
-+                    case K_HELP:
-+                        kernel_map[map][key] = KeyMap( Qt::Key_Help, kval );
-+                        break;
-+                    case K_PAUSE:
-+                        kernel_map[map][key] = KeyMap( Qt::Key_Pause, kval );
-+                        break;
-+                    case K_FIND:
-+                    case K_DO:
-+                    default:
-+                        kernel_map[map][key] = KeyMap( Qt::Key_unknown, kval );
-+                        break;
-+                    }
-+                break;
-+
-+            case KT_SPEC:
-+                switch ( kbe.kb_value ) {
-+                case K_ENTER:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_Enter, kval );
-+                    break;
-+                case K_CAPS:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_CapsLock, kval );
-+                    break;
-+                case K_NUM:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_NumLock, kval );
-+                    break;
-+                case K_HOLD:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_ScrollLock, kval );
-+                    break;
-+                case K_HOLE:
-+                case K_SH_REGS:
-+                case K_SH_MEM:
-+                case K_SH_STAT:
-+                case K_BREAK:
-+                case K_CONS:
-+                case K_SCROLLFORW:
-+                case K_SCROLLBACK:
-+                case K_BOOT:
-+                case K_CAPSON:
-+                case K_COMPOSE:
-+                case K_SAK:
-+                case K_DECRCONSOLE:
-+                case K_INCRCONSOLE:
-+                case K_SPAWNCONSOLE:
-+                case K_BARENUMLOCK:
-+                default:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_unknown, kval );
-+                    break;
-+                }
-+                break;
-+            case KT_PAD:
-+                /*
-+                 * Number Values might be wrong
-+                 */
-+                switch(kbe.kb_value ) {
-+                case K_P0:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_0, kval );
-+                    break;
-+                case K_P1:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_1, kval );
-+                    break;
-+                case K_P2:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_2, kval );
-+                    break;
-+                case K_P3:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_3, kval );
-+                    break;
-+                case K_P4:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_4, kval );
-+                    break;
-+                case K_P5:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_5, kval );
-+                    break;
-+                case K_P6:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_6, kval );
-+                    break;
-+                case K_P7:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_7, kval );
-+                    break;
-+                case K_P8:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_8, kval );
-+                    break;
-+                case K_P9:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_9, kval );
-+                    break;
-+                case K_PPLUS:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_Plus, kval );
-+                    break;
-+                case K_PMINUS:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_Minus, kval );
-+                    break;
-+                case K_PSTAR:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_multiply, kval );
-+                    break;
-+                case K_PSLASH:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_division, kval );
-+                    break;
-+                case K_PENTER:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_Enter, kval );
-+                    break;
-+                case K_PCOMMA:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_Comma, kval ) ;
-+                    break;
-+                case K_PPLUSMINUS:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_plusminus, kval );
-+                case K_PDOT:
-+                    break;
-+                case K_PPARENL:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_ParenLeft, kval );
-+                    break;
-+                case K_PPARENR:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_ParenRight, kval );
-+                    break;
-+                default:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_unknown, kval );
-+                    break;
-+                }
-+                break;
-+            case KT_DEAD:
-+                switch(kbe.kb_value ) {
-+                case K_DGRAVE:
-+                case K_DACUTE:
-+                case K_DCIRCM:
-+                case K_DTILDE:
-+                case K_DDIERE:
-+                case K_DCEDIL:
-+                default:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_unknown, kval );
-+                    break;
-+                }
-+                break;
-+
-+            case KT_CONS:
-+                kernel_map[map][key] = KeyMap( Qt::Key_unknown, kval );
-+                break;
-+
-+            case KT_CUR:
-+                switch(kbe.kb_value ) {
-+                case K_DOWN:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_Down, kval );
-+                    break;
-+                case K_LEFT:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_Left, kval );
-+                    break;
-+                case K_RIGHT:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_Right, kval );
-+                    break;
-+                case K_UP:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_Up, kval );
-+                    break;
-+                }
-+                break;
-+
-+            case KT_SHIFT:
-+                switch( kbe.kb_value ) {
-+                case K_SHIFT:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_Shift, kval );
-+                    break;
-+                case K_ALT:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_Alt, kval );
-+                    break;
-+                case K_CTRL:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_Control, kval );
-+                    break;
-+                case K_ALTGR:
-+                    kernel_map[map][key] = KeyMap( KeyMap::Key_AltGr, kval );
-+                    break;
-+                case K_SHIFTL:
-+                case K_SHIFTR:
-+                case K_CTRLL:
-+                case K_CTRLR:
-+                case K_CAPSSHIFT:
-+                default:
-+                    kernel_map[map][key] = KeyMap( Qt::Key_unknown, kval );
-+                    break;
-+                }
-+                break;
-+            /*
-+             * What is this for?
-+             */
-+            case KT_ASCII:
-+            case KT_LOCK:
-+            case KT_SLOCK:
-+            default:
-+                kernel_map[map][key] = KeyMap( Qt::Key_unknown, kval );
-+                //qWarning("keycode %d, map %d, type %d, val %d, acm %c\n", key, map, KTYP(kbe.kb_value), kval, acm[kval]);
-+                break;
-+            }
-+        }
-+    }
-+}
-+int QWSTtyKeyboardHandler::map_to_modif()
-+{
-+    int modifiers = 0;
-+
-+    if (current_map & (1<<KG_ALT))
-+        modifiers |= Qt::AltButton;
-+    else if (current_map & (1<<KG_CTRL))
-+        modifiers |= Qt::ControlButton;
-+    else if (current_map & (1<<KG_SHIFT))
-+        modifiers |= Qt::ShiftButton;
-+
-+    return modifiers;
-+}
-+
-+/*
-+ * Handle Extra Keys for VT switching and Quitting
-+ */
-+void QWSTtyKeyboardHandler::handleExtra( unsigned int key, bool release ) {
-+    if ( !release ) {
-+        int term = 0;
-+        if ( (modifier & (1<<KG_ALT)) && (modifier & (1<<KG_CTRL)) ) {
-+            if ( key == Qt::Key_Left )
-+                term = QMAX(vtQws -1, 1 );
-+            else if ( key == Qt::Key_Right )
-+                term = QMIN(vtQws +1, 12 );
-+        }
-+
-+        if ( key >= KeyMap::Key_Console1 && key <= KeyMap::Key_Console12 )
-+            term = key - KeyMap::Key_Console1 + 1;
-+
-+        if ( term != 0 ) {
-+            current_map = modifier = 0;
-+            numlock = capslock = false;
-+            ioctl(kbdFD, VT_ACTIVATE, term );
-+            return;
-+        }
-+    }
-+
-+    if ( (modifier & (1<<KG_ALT)) && (modifier & (1<<KG_CTRL) ) )
-+         if ( key == Qt::Key_Delete || key == Qt::Key_Backspace ) {
-+             qWarning( "Instructed to quit on %d", key );
-+             qApp->quit();
-+         }
-+}
-+
-+/*
-+ * apply modifier
-+ */
-+void QWSTtyKeyboardHandler::modifyModifier( int map, int modify, bool release ) {
-+    if (map != -1) {
-+        if (release)
-+            current_map &= ~map;
-+        else
-+            current_map |= map;
-+    }
-+
-+    if ( modify != -1 ) {
-+        if (release)
-+            modifier &= ~modify;
-+        else
-+            modifier |=  modify;
-+    }
-+}
-+
-+void QWSTtyKeyboardHandler::handleKey(unsigned char code)
-+{
-+    int old_modifier = modifier;
-+    bool release = false;
-+    bool mod_key = true;
-+
-+    if (code & 0x80)
-+    {
-+        release = true;
-+        code &= 0x7f;
-+    }
-+
-+    KeyMap key_map = kernel_map[current_map][code];
-+    unsigned short unicode = acm[key_map.code];
-+    unsigned int   qtKeyCode = key_map.key;
-+
-+    if ( !release )
-+        qWarning( "KeyCode: %d KVAL: %d", qtKeyCode, key_map.code );
-+//        qWarning( "Alt:%d Ctrl:%d Shift:%d Key = %d", modifier & (1<<KG_ALT),
-+//                  modifier & (1<<KG_CTRL),
-+//                  modifier & (1<<KG_SHIFT), key_map.key );
-+//    qDebug("code %d, mCode %d, uni '%c', qtKeyCode %d", code, map.code,
-+//           QChar(unicode ).isPrint() ?
-+//           unicode : '?' , qtKeyCode);
-+
-+    // Handle map changes based on press/release of modifiers
-+    // hardcoded for now
-+    int modif = -1;
-+    int map   = -1;
-+    bool lock = false;
-+    switch (qtKeyCode)
-+    {
-+    case Qt::Key_Alt:
-+    case Qt::Key_F22:
-+        modif = (1<<KG_ALT);
-+        break;
-+    case Qt::Key_Control:
-+        modif = (1<<KG_CTRL);
-+        map   = modif;
-+        break;
-+    case Qt::Key_Shift:
-+        modif = (1<<KG_SHIFT);
-+        map   = modif;
-+        break;
-+    case KeyMap::Key_AltGr:
-+        map   = (1<<KG_ALTGR );
-+        break;
-+    case Qt::Key_Left:
-+    case Qt::Key_Right:
-+    case Qt::Key_Up:
-+    case Qt::Key_Down:
-+        mod_key = false;
-+        if (qt_screen->isTransformed())
-+            qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) );
-+        break;
-+    /*
-+     * handle lock, we don't handle scroll lock!
-+     */
-+    case Qt::Key_CapsLock:
-+    case Qt::Key_NumLock:
-+        lock = true;
-+    default:
-+        mod_key = false;
-+        break;
-+    }
-+
-+
-+    /*
-+     * Change the Map. We handle locks a bit different
-+     */
-+    if ( lock )
-+        modifyLock( qtKeyCode, release );
-+    else
-+        modifyModifier( map, modif, release );
-+
-+    handleExtra( qtKeyCode, release );
-+
-+    /*
-+     * do not repeat modifier keys
-+     */
-+    if ( modifier == old_modifier && mod_key )
-+        return;
-+
-+    processKeyEvent(unicode & 0xff, qtKeyCode, map_to_modif(), !release, 0);
-+}
- 
- void QWSTtyKeyboardHandler::readKeyboardData()
- {
-     unsigned char buf[81];
-     int n = ::read(kbdFD, buf, 80 );
-     for ( int loop = 0; loop < n; loop++ )
--	doKey(buf[loop]);
-+       handleKey(buf[loop]);
-+}
-+
-+void QWSTtyKeyboardHandler::modifyLock( unsigned int lock, bool release ) {
-+    if ( !release )
-+        return;
-+
-+    if ( lock == Qt::Key_CapsLock ) {
-+        toggleLed( LED_CAP );
-+        capslock = !capslock;
-+    }else if ( lock == Qt::Key_NumLock ) {
-+        toggleLed( LED_NUM );
-+        numlock = !numlock;
-+    }
-+}
-+
-+void QWSTtyKeyboardHandler::restoreLeds() {
-+    unsigned int leds;
-+    ioctl(kbdFD, KDGETLED, &leds );
-+    leds &= ~LED_CAP;
-+    leds &= ~LED_NUM;
-+    ioctl(kbdFD, KDSETLED, &leds );
-+}
-+
-+void QWSTtyKeyboardHandler::toggleLed(unsigned int led) {
-+    unsigned int leds;
-+    int ret = ioctl(kbdFD, KDGETLED, &leds );
-+    leds = leds & led ? (leds & ~led) : (leds | led);
-+    ret = ioctl(kbdFD, KDSETLED, &leds );
- }
- 
- typedef struct {
-@@ -1439,13 +1966,13 @@
- 	return;
- #ifdef QT_QWS_TIP2
-     // custom scan codes - translate them and create a key event immediately
--    if( overrideMap && event.value == 0 || overrideMap->find( event.value ) ) 
-+    if( overrideMap && event.value == 0 || overrideMap->find( event.value ) )
-     {
- 	if( event.value )
- 	{
- 	    int modifiers = 0;
- 	    QWSServer::KeyMap *km = overrideMap->find( event.value );
--	    switch( km->unicode ) 
-+	    switch( km->unicode )
- 	    {
- 		case Key_Menu:
- 		case Key_Back:
-@@ -1473,14 +2000,14 @@
- 							TRUE, FALSE );
- 	    }
- 	    lastPress = km;
--	} 
--	else if( lastPress ) 
-+	}
-+	else if( lastPress )
- 	{
--	    processKeyEvent( lastPress->unicode, lastPress->key_code, 0, 
-+	    processKeyEvent( lastPress->unicode, lastPress->key_code, 0,
- 							    FALSE, FALSE );
- 	    lastPress = 0;
- 	}
--    } 
-+    }
-     else
- #endif
-     {
-@@ -1845,10 +2372,10 @@
- 	handler = new QWSUsbKeyboardHandler(device);
-     } else if ( type == "TTY" ) {
- 	handler = new QWSTtyKeyboardHandler(device);
--    } 
-+    }
-     else if( type == "Samsung" )  {
- 	handler = new QWSSamsungKeypadHandler(device);
--    } 
-+    }
-     else {
- 	qWarning( "Keyboard type %s:%s unsupported", spec.latin1(), device.latin1() );
-     }
---- /dev/null
-+++ qt-2.3.10-snapshot-20050131/src/kernel/keyboard_linux_to_qt.h
-@@ -0,0 +1,263 @@
-+/*
-+ * Generated with a small python utility found at
-+ * http://handhelds.org/~zecke/downloads/python_keytable_creator.py
-+ */
-+
-+static const Qt::Key linux_to_qt[] = {
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_Backspace,
-+Qt::Key_Tab,
-+Qt::Key_unknown, // LineFeed
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,  // No Symbol
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown, // No Symbol
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_Escape,
-+Qt::Key_unknown,
-+Qt::Key_unknown,  // No symbol
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_Space,
-+Qt::Key_Exclam,
-+Qt::Key_QuoteDbl,
-+Qt::Key_NumberSign,
-+Qt::Key_Dollar,
-+Qt::Key_Percent,
-+Qt::Key_Ampersand,
-+Qt::Key_Apostrophe,
-+Qt::Key_ParenLeft,
-+Qt::Key_ParenRight,
-+Qt::Key_Asterisk,
-+Qt::Key_Plus,
-+Qt::Key_Comma,
-+Qt::Key_Minus,
-+Qt::Key_Period,
-+Qt::Key_Slash,
-+Qt::Key_0,
-+Qt::Key_1,
-+Qt::Key_2,
-+Qt::Key_3,
-+Qt::Key_4,
-+Qt::Key_5,
-+Qt::Key_6,
-+Qt::Key_7,
-+Qt::Key_8,
-+Qt::Key_9,
-+Qt::Key_Colon,
-+Qt::Key_Semicolon,
-+Qt::Key_Less,
-+Qt::Key_Equal,
-+Qt::Key_Greater,
-+Qt::Key_Question,
-+Qt::Key_At,
-+Qt::Key_A,
-+Qt::Key_B,
-+Qt::Key_C,
-+Qt::Key_D,
-+Qt::Key_E,
-+Qt::Key_F,
-+Qt::Key_G,
-+Qt::Key_H,
-+Qt::Key_I,
-+Qt::Key_J,
-+Qt::Key_K,
-+Qt::Key_L,
-+Qt::Key_M,
-+Qt::Key_N,
-+Qt::Key_O,
-+Qt::Key_P,
-+Qt::Key_Q,
-+Qt::Key_R,
-+Qt::Key_S,
-+Qt::Key_T,
-+Qt::Key_U,
-+Qt::Key_V,
-+Qt::Key_W,
-+Qt::Key_X,
-+Qt::Key_Y,
-+Qt::Key_Z,
-+Qt::Key_BracketLeft,
-+Qt::Key_Backslash,
-+Qt::Key_BracketRight,
-+Qt::Key_AsciiCircum,
-+Qt::Key_Underscore,
-+Qt::Key_QuoteLeft, // grave
-+Qt::Key_A,
-+Qt::Key_B,
-+Qt::Key_C,
-+Qt::Key_D,
-+Qt::Key_E,
-+Qt::Key_F,
-+Qt::Key_G,
-+Qt::Key_H,
-+Qt::Key_I,
-+Qt::Key_J,
-+Qt::Key_K,
-+Qt::Key_L,
-+Qt::Key_M,
-+Qt::Key_N,
-+Qt::Key_O,
-+Qt::Key_P,
-+Qt::Key_Q,
-+Qt::Key_R,
-+Qt::Key_S,
-+Qt::Key_T,
-+Qt::Key_U,
-+Qt::Key_V,
-+Qt::Key_W,
-+Qt::Key_X,
-+Qt::Key_Y,
-+Qt::Key_Z,
-+Qt::Key_BraceLeft,
-+Qt::Key_Bar,
-+Qt::Key_BraceRight,
-+Qt::Key_AsciiTilde,
-+Qt::Key_BackSpace,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_unknown,
-+Qt::Key_nobreakspace,
-+Qt::Key_exclamdown,
-+Qt::Key_cent,
-+Qt::Key_sterling,
-+Qt::Key_currency,
-+Qt::Key_yen,
-+Qt::Key_brokenbar,
-+Qt::Key_section,
-+Qt::Key_diaeresis,
-+Qt::Key_copyright,
-+Qt::Key_ordfeminine,
-+Qt::Key_guillemotleft,
-+Qt::Key_notsign,
-+Qt::Key_hyphen,
-+Qt::Key_registered,
-+Qt::Key_macron,
-+Qt::Key_degree,
-+Qt::Key_plusminus,
-+Qt::Key_twosuperior,
-+Qt::Key_threesuperior,
-+Qt::Key_acute,
-+Qt::Key_mu,
-+Qt::Key_paragraph,
-+Qt::Key_periodcentered,
-+Qt::Key_cedilla,
-+Qt::Key_onesuperior,
-+Qt::Key_masculine,
-+Qt::Key_guillemotright,
-+Qt::Key_onequarter,
-+Qt::Key_onehalf,
-+Qt::Key_threequarters,
-+Qt::Key_questiondown,
-+Qt::Key_Agrave,
-+Qt::Key_Aacute,
-+Qt::Key_Acircumflex,
-+Qt::Key_Atilde,
-+Qt::Key_Adiaeresis,
-+Qt::Key_Aring,
-+Qt::Key_AE,
-+Qt::Key_Ccedilla,
-+Qt::Key_Egrave,
-+Qt::Key_Eacute,
-+Qt::Key_Ecircumflex,
-+Qt::Key_Ediaeresis,
-+Qt::Key_Igrave,
-+Qt::Key_Iacute,
-+Qt::Key_Icircumflex,
-+Qt::Key_Idiaeresis,
-+Qt::Key_ETH,
-+Qt::Key_Ntilde,
-+Qt::Key_Ograve,
-+Qt::Key_Oacute,
-+Qt::Key_Ocircumflex,
-+Qt::Key_Otilde,
-+Qt::Key_Odiaeresis,
-+Qt::Key_multiply,
-+Qt::Key_Ooblique,
-+Qt::Key_Ugrave,
-+Qt::Key_Uacute,
-+Qt::Key_Ucircumflex,
-+Qt::Key_Udiaeresis,
-+Qt::Key_Yacute,
-+Qt::Key_THORN,
-+Qt::Key_ssharp,
-+Qt::Key_agrave,
-+Qt::Key_aacute,
-+Qt::Key_acircumflex,
-+Qt::Key_atilde,
-+Qt::Key_adiaeresis,
-+Qt::Key_aring,
-+Qt::Key_ae,
-+Qt::Key_ccedilla,
-+Qt::Key_egrave,
-+Qt::Key_eacute,
-+Qt::Key_ecircumflex,
-+Qt::Key_ediaeresis,
-+Qt::Key_igrave,
-+Qt::Key_iacute,
-+Qt::Key_icircumflex,
-+Qt::Key_idiaeresis,
-+Qt::Key_eth,
-+Qt::Key_ntilde,
-+Qt::Key_ograve,
-+Qt::Key_oacute,
-+Qt::Key_ocircumflex,
-+Qt::Key_otilde,
-+Qt::Key_odiaeresis,
-+Qt::Key_division,
-+Qt::Key_oslash,
-+Qt::Key_ugrave,
-+Qt::Key_uacute,
-+Qt::Key_ucircumflex,
-+Qt::Key_udiaeresis,
-+Qt::Key_yacute,
-+Qt::Key_thorn,
-+Qt::Key_ydiaeresis
-+}; 
diff --git a/packages/qte/qte-2.3.10-snapshot/opie.patch b/packages/qte/qte-2.3.10-snapshot/opie.patch
deleted file mode 100644
index d754bfe51c..0000000000
--- a/packages/qte/qte-2.3.10-snapshot/opie.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- qt-2.3.10-snapshot-20050131/src/kernel/qapplication.cpp~opie
-+++ qt-2.3.10-snapshot-20050131/src/kernel/qapplication.cpp
-@@ -35,6 +35,8 @@
- **
- **********************************************************************/
- 
-+#define QT_WEAK_SYMBOL	__attribute__(( weak ))
-+
- #include "qobjectlist.h"
- #include "qobjectdict.h"
- #include "qapplication.h"
-@@ -937,11 +939,16 @@
- #ifndef QT_NO_STYLE
- void QApplication::setStyle( QStyle *style )
- {
-+	setStyle_NonWeak ( style );
-+}
-+
-+void QApplication::setStyle_NonWeak( QStyle *style )
-+{
-     QStyle* old = app_style;
--    app_style = style;
- 
-     if ( startingUp() ) {
- 	delete old;
-+	app_style = style;
- 	return;
-     }
- 
-@@ -962,6 +969,8 @@
- 	old->unPolish( qApp );
-     }
- 
-+    app_style = style;
-+ 
-     // take care of possible palette requirements of certain gui
-     // styles. Do it before polishing the application since the style
-     // might call QApplication::setStyle() itself
-@@ -1188,13 +1197,30 @@
-   \sa QWidget::setPalette(), palette(), QStyle::polish()
- */
- 
--void QApplication::setPalette( const QPalette &palette, bool informWidgets,
-+void QApplication::setPalette ( const QPalette &palette, bool informWidgets,
-+			       const char* className )
-+{
-+	setPalette_NonWeak ( palette, informWidgets, className );
-+}
-+
-+void QApplication::setPalette_NonWeak ( const QPalette &palette, bool informWidgets,
- 			       const char* className )
- {
-     QPalette pal = palette;
- #ifndef QT_NO_STYLE
--    if ( !startingUp() )
-+    if ( !startingUp() ) {
- 	qApp->style().polish( pal );	// NB: non-const reference
-+	if ( className ) {
-+	    // if we just polished a class specific palette (this normally 
-+	    // only called by qt_fix_tooltips - see below), we better re-
-+	    // polish the global palette. Some styles like liquid can get 
-+	    // confused, because they can not detect if the polished palette 
-+	    // is the global one or only a class specific one.
-+	    // (liquid uses this palette to calculate blending pixmaps)
-+	    QPalette p = qApp-> palette ( );
-+	    qApp->style().polish ( p );
-+	}
-+    }
- #endif
-     bool all = FALSE;
-     if ( !className ) {
-@@ -1279,6 +1305,12 @@
- void QApplication::setFont( const QFont &font, bool informWidgets,
- 			    const char* className )
- {
-+	setFont_NonWeak ( font, informWidgets, className );
-+}
-+
-+void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets,
-+			    const char* className )
-+{
-     bool all = FALSE;
-     if ( !className ) {
- 	if ( !app_font ) {
---- qt-2.3.10-snapshot-20050131/src/kernel/qapplication.h~opie
-+++ qt-2.3.10-snapshot-20050131/src/kernel/qapplication.h
-@@ -61,6 +61,10 @@
- class QSemaphore;
- #endif
- 
-+#if !defined( QT_WEAK_SYMBOL )
-+#define QT_WEAK_SYMBOL
-+#endif
-+
- // REMOVE IN 3.0 (just here for moc source compatibility)
- #define QNonBaseApplication QApplication
- 
-@@ -85,7 +89,10 @@
- 
- #ifndef QT_NO_STYLE
-     static QStyle  &style();
--    static void	    setStyle( QStyle* );
-+    static void	    setStyle( QStyle* ) QT_WEAK_SYMBOL;
-+private:
-+	static void     setStyle_NonWeak( QStyle* );
-+public:
- #endif
- #if 1	/* OBSOLETE */
-     enum ColorMode { NormalColors, CustomColors };
-@@ -106,11 +113,19 @@
- #ifndef QT_NO_PALETTE
-     static QPalette  palette( const QWidget* = 0 );
-     static void	     setPalette( const QPalette &, bool informWidgets=FALSE,
-+				 const char* className = 0 ) QT_WEAK_SYMBOL;
-+private:
-+    static void	     setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE,
- 				 const char* className = 0 );
-+public:
- #endif
-     static QFont     font( const QWidget* = 0 );
-     static void	     setFont( const QFont &, bool informWidgets=FALSE,
-+			      const char* className = 0 ) QT_WEAK_SYMBOL;
-+private:
-+    static void	     setFont_NonWeak( const QFont &, bool informWidgets=FALSE,
- 			      const char* className = 0 );
-+public:			      
-     static QFontMetrics fontMetrics();
- 
-     QWidget	    *mainWidget()  const;
-@@ -207,7 +222,10 @@
-     void             qwsSetCustomColors( QRgb *colortable, int start, int numColors );
- #ifndef QT_NO_QWS_MANAGER
-     static QWSDecoration &qwsDecoration();
--    static void      qwsSetDecoration( QWSDecoration *);
-+    static void      qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL;
-+private:
-+    static void      qwsSetDecoration_NonWeak( QWSDecoration *);
-+public:
- #endif
- #endif
- 
---- qt-2.3.10-snapshot-20050131/src/kernel/qapplication_qws.cpp~opie
-+++ qt-2.3.10-snapshot-20050131/src/kernel/qapplication_qws.cpp
-@@ -3076,6 +3076,11 @@
- */
- void QApplication::qwsSetDecoration( QWSDecoration *d )
- {
-+	qwsSetDecoration_NonWeak ( d );
-+}
-+
-+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d )
-+{
-     if ( d ) {
- 	delete qws_decoration;
- 	qws_decoration = d;
---- qt-2.3.10-snapshot-20050131/src/kernel/qfontdatabase.cpp~opie
-+++ qt-2.3.10-snapshot-20050131/src/kernel/qfontdatabase.cpp
-@@ -35,6 +35,8 @@
- **
- **********************************************************************/
- 
-+#define QT_WEAK_SYMBOL  __attribute__(( weak ))
-+
- #include "qfontdatabase.h"
- 
- #ifndef QT_NO_FONTDATABASE
-@@ -2424,6 +2426,13 @@
-                                                  const QString &style,
-                                                  const QString &charSet )
- {
-+	return pointSizes_NonWeak ( family, style, charSet );
-+}
-+
-+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family,
-+                                                 const QString &style,
-+                                                 const QString &charSet )
-+{
-     QString cs( charSet );
-     if ( charSet.isEmpty() ) {
-         QStringList lst = charSets( family );
---- qt-2.3.10-snapshot-20050131/src/kernel/qfontdatabase.h~opie
-+++ qt-2.3.10-snapshot-20050131/src/kernel/qfontdatabase.h
-@@ -59,6 +59,10 @@
- class QDiskFont;
- #endif
- 
-+#if !defined( QT_WEAK_SYMBOL )
-+#define QT_WEAK_SYMBOL
-+#endif
-+
- class QFontDatabasePrivate;
- 
- class Q_EXPORT QFontDatabase
-@@ -67,9 +71,16 @@
-     QFontDatabase();
- 
-     QStringList families( bool onlyForLocale = TRUE ) const;
-+    
-+    
-     QValueList<int> pointSizes( const QString &family,
- 				const QString &style = QString::null,
--				const QString &charSet = QString::null );
-+				const QString &charSet = QString::null ) QT_WEAK_SYMBOL;
-+private:
-+    QValueList<int> pointSizes_NonWeak( const QString &family,
-+				const QString &style,
-+				const QString &charSet );
-+public:
-     QStringList styles( const QString &family,
- 			const QString &charSet = QString::null ) const;
-     QStringList charSets( const QString &familyName,
---- qt-2.3.10-snapshot-20050131/src/kernel/qgfxraster_qws.cpp~opie
-+++ qt-2.3.10-snapshot-20050131/src/kernel/qgfxraster_qws.cpp
-@@ -4409,7 +4409,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
- 
---- qt-2.3.10-snapshot-20050131/src/widgets/qcommonstyle.cpp~opie
-+++ qt-2.3.10-snapshot-20050131/src/widgets/qcommonstyle.cpp
-@@ -572,7 +572,7 @@
- 				    bool enabled, bool active )
- {
- #ifndef QT_NO_MENUBAR
--#ifndef QT_NO_STYLE_SGI
-+#if 1 // #ifndef QT_NO_STYLE_SGI
-     if (draw_menu_bar_impl != 0) {
- 	QDrawMenuBarItemImpl impl = draw_menu_bar_impl;
- 	(this->*impl)(p, x, y, w, h, mi, g, enabled, active);
---- qt-2.3.10-snapshot-20050131/src/widgets/qlistview.cpp~opie
-+++ qt-2.3.10-snapshot-20050131/src/widgets/qlistview.cpp
-@@ -5051,9 +5051,9 @@
- 	l = l->childItem ? l->childItem : l->siblingItem;
- 
-     if ( l && l->height() )
--	s.setHeight( s.height() + 10 * l->height() );
--    else
--	s.setHeight( s.height() + 140 );
-+	s.setHeight( s.height() + 4 /*10*/ * l->height() );
-+    else                      // ^v much too big for handhelds
-+	s.setHeight( s.height() + 30 /*140*/ );
- 
-     if ( s.width() > s.height() * 3 )
- 	s.setHeight( s.width() / 3 );
---- qt-2.3.10-snapshot-20050131/src/kernel/qwindowsystem_qws.cpp~opie
-+++ qt-2.3.10-snapshot-20050131/src/kernel/qwindowsystem_qws.cpp
-@@ -918,6 +918,18 @@
- {
- }
- 
-+static void catchSegvSignal( int )
-+{
-+#ifndef QT_NO_QWS_KEYBOARD
-+    if ( qwsServer )
-+	qwsServer->closeKeyboard();
-+#endif
-+    QWSServer::closedown();
-+    fprintf(stderr, "Segmentation fault.\n");
-+    exit(1);
-+}
-+
-+
- /*!
-   \class QWSServer qwindowsystem_qws.h
-   \brief Server-specific functionality in Qt/Embedded
-@@ -1043,6 +1055,7 @@
-     }
- 
-     signal(SIGPIPE, ignoreSignal); //we get it when we read
-+    signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash
- #endif
-     focusw = 0;
-     mouseGrabber = 0;
---- qt-2.3.10-snapshot-20050131/src/widgets/qtoolbutton.cpp~opie
-+++ qt-2.3.10-snapshot-20050131/src/widgets/qtoolbutton.cpp
-@@ -332,12 +332,12 @@
- 	QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal);
- 	w = pm.width();
- 	h = pm.height();
--	if ( w < 32 )
--	    w = 32;
--	if ( h < 32 )
--	    h = 32;
-+	if ( w < 24 )
-+	    w = 24;
-+	if ( h < 24 )
-+	    h = 24;
-     } else {
--	w = h = 16;
-+	w = h = 14;
- 	QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal);
- 	w = pm.width();
- 	h = pm.height();
diff --git a/packages/qte/qte-2.3.10-snapshot/qiconview-speed.patch b/packages/qte/qte-2.3.10-snapshot/qiconview-speed.patch
deleted file mode 100644
index bac9b9705f..0000000000
--- a/packages/qte/qte-2.3.10-snapshot/qiconview-speed.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- qt-2.3.10-snapshot-20050131/src/iconview/qiconview.cpp~qiconview-speed
-+++ qt-2.3.10-snapshot-20050131/src/iconview/qiconview.cpp
-@@ -225,6 +225,7 @@
-     QIconView::SelectionMode selectionMode;
-     QIconViewItem *currentItem, *tmpCurrentItem, *highlightedItem, *startDragItem, *pressedItem, *selectAnchor;
-     QRect *rubber;
-+    QPixmap *backBuffer;
-     QTimer *scrollTimer, *adjustTimer, *updateTimer, *inputTimer,
- 	*fullRedrawTimer;
-     int rastX, rastY, spacing;
-@@ -2268,6 +2269,7 @@
-     d->currentItem = 0;
-     d->highlightedItem = 0;
-     d->rubber = 0;
-+    d->backBuffer = 0;
-     d->scrollTimer = 0;
-     d->startDragItem = 0;
-     d->tmpCurrentItem = 0;
-@@ -2416,6 +2418,8 @@
- 	delete item;
- 	item = tmp;
-     }
-+    delete d->backBuffer;
-+    d->backBuffer = 0;
-     delete d->fm;
-     d->fm = 0;
- #ifndef QT_NO_TOOLTIP
-@@ -2882,6 +2886,48 @@
- }
- 
- /*!
-+    This function grabs all paintevents that otherwise would have been
-+    processed by the QScrollView::viewportPaintEvent(). Here we use a
-+    doublebuffer to reduce 'on-paint' flickering on QIconView
-+    (and of course its childs).
-+
-+    \sa QScrollView::viewportPaintEvent(), QIconView::drawContents()
-+*/
-+
-+void QIconView::bufferedPaintEvent( QPaintEvent* pe )
-+{
-+    QWidget* vp = viewport();
-+    QRect r = pe->rect() & vp->rect();
-+    int ex = r.x() + contentsX();
-+    int ey = r.y() + contentsY();
-+    int ew = r.width();
-+    int eh = r.height();
-+
-+    if ( !d->backBuffer )
-+	d->backBuffer = new QPixmap(vp->size());
-+    if ( d->backBuffer->size() != vp->size() ) {
-+	//Resize function (with hysteesis). Uses a good compromise between memory
-+	//consumption and speed (number) of resizes.
-+        float newWidth = (float)vp->width();
-+	float newHeight = (float)vp->height();
-+	if ( newWidth > d->backBuffer->width() || newHeight > d->backBuffer->height() )
-+	{
-+	    newWidth *= 1.1892;
-+	    newHeight *= 1.1892;
-+	    d->backBuffer->resize( (int)newWidth, (int)newHeight );
-+	} else if ( 1.5*newWidth < d->backBuffer->width() || 1.5*newHeight < d->backBuffer->height() )
-+	    d->backBuffer->resize( (int)newWidth, (int)newHeight );
-+    }
-+
-+    QPainter p;
-+    p.begin(d->backBuffer, vp);
-+    drawContentsOffset(&p, contentsX(), contentsY(), ex, ey, ew, eh);
-+    p.end();
-+    bitBlt(vp, r.x(), r.y(), d->backBuffer, r.x(), r.y(), ew, eh);
-+}
-+
-+/*!
-+
-   \reimp
- */
- 
-@@ -4939,7 +4985,7 @@
- 		if ( !d->rubber )
- 		    drawDragShapes( d->oldDragPos );
- 	    }
--	    viewportPaintEvent( (QPaintEvent*)e );
-+            bufferedPaintEvent ((QPaintEvent*)e );
- 	    if ( d->dragging ) {
- 		if ( !d->rubber )
- 		    drawDragShapes( d->oldDragPos );
-@@ -5377,11 +5423,19 @@
- 	return;
- 
-     if ( item->d->container1 && d->firstContainer ) {
--	item->d->container1->items.removeRef( item );
-+       //Special-case checking of the last item, since this may be
-+       //called a few times for the same item.
-+        if (item->d->container1->items.last() == item)
-+            item->d->container1->items.removeLast();
-+        else
-+            item->d->container1->items.removeRef( item );
-     }
-     item->d->container1 = 0;
-     if ( item->d->container2 && d->firstContainer ) {
--	item->d->container2->items.removeRef( item );
-+        if (item->d->container2->items.last() == item)
-+            item->d->container2->items.removeLast();
-+        else
-+            item->d->container2->items.removeRef( item );
-     }
-     item->d->container2 = 0;
- 
---- qt-2.3.10-snapshot-20050131/src/iconview/qiconview.h~qiconview-speed
-+++ qt-2.3.10-snapshot-20050131/src/iconview/qiconview.h
-@@ -444,6 +444,7 @@
-     virtual void contentsDropEvent( QDropEvent *e );
- #endif
- 
-+    void bufferedPaintEvent( QPaintEvent* );
-     virtual void resizeEvent( QResizeEvent* e );
-     virtual void keyPressEvent( QKeyEvent *e );
-     virtual void focusInEvent( QFocusEvent *e );
diff --git a/packages/qte/qte-2.3.10-snapshot/simpad.patch b/packages/qte/qte-2.3.10-snapshot/simpad.patch
deleted file mode 100644
index 1777a94ede..0000000000
--- a/packages/qte/qte-2.3.10-snapshot/simpad.patch
+++ /dev/null
@@ -1,413 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- qt-2.3.10-snapshot-20050131/src/kernel/qkeyboard_qws.cpp~simpad
-+++ qt-2.3.10-snapshot-20050131/src/kernel/qkeyboard_qws.cpp
-@@ -37,6 +37,7 @@
- #include <qapplication.h>
- #include <qsocketnotifier.h>
- #include <qnamespace.h>
-+#include <qdatetime.h>
- #include <qtimer.h>
- 
- #include <stdlib.h>
-@@ -80,6 +81,60 @@
- #include <sys/vt.h>
- #endif
- 
-+/*
-+ * SIMpad switches handler
-+ * (C) 2003-2005 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
-+ */
-+
-+
-+
-+#include <linux/switches.h>
-+#define SIMPAD_SWITCHES_DEVICE "/dev/misc/switches"
-+
-+// switches from left top to right down over the SIMpad surface
-+
-+#define SIMPAD_SWITCH_POWER 0x02
-+#define SIMPAD_SWITCH_UPPER 0x10
-+#define SIMPAD_SWITCH_UP 0x20
-+#define SIMPAD_SWITCH_DOWN 0x40
-+#define SIMPAD_SWITCH_LEFT 0x80
-+#define SIMPAD_SWITCH_RIGHT 0x100
-+#define SIMPAD_SWITCH_LOWER 0x8
-+
-+class QWSsimpadButtonsHandler : public QWSKeyboardHandler
-+{
-+  Q_OBJECT
-+
-+  public:
-+    QWSsimpadButtonsHandler();
-+    virtual ~QWSsimpadButtonsHandler();
-+
-+    bool isOpen() { return fd > 0; }
-+
-+  private slots:
-+    void readSwitchesData();
-+    void autoRepeat();
-+
-+  private:
-+    switches_mask_t switches;
-+
-+    int fd;
-+    int repeatdelay;
-+    int repeatperiod;
-+
-+    int lastCode;         // last native code
-+    int lastPress;        // last press/release state
-+
-+    int k;                // last emitted Qt key code
-+    int shiftKeyPressed;  // true if one of the SHIFT keys has been pressed and not yet released
-+    bool shiftUsed;       // true if SHIFT has been used
-+
-+    QTime eventTimer;     // tracks time between raw events
-+    QTimer* repeater;
-+    QSocketNotifier *notifier;
-+};
-+
-+
- #ifdef QT_QWS_SL5XXX
- #include <asm/sharp_char.h>
- #endif
-@@ -165,9 +220,9 @@
- 	    current = 0;
-     }
- 
--    void setAutoRepeat(int d, int p) { if ( d > 0 ) repeatdelay=d; 
-+    void setAutoRepeat(int d, int p) { if ( d > 0 ) repeatdelay=d;
- 				       if ( p > 0 ) repeatperiod=p;}
--    void getAutoRepeat(int *d ,int *p ) { if (d) *d=repeatdelay; 
-+    void getAutoRepeat(int *d ,int *p ) { if (d) *d=repeatdelay;
-     					  if (p) *p=repeatperiod; }
- 
-     void stop()
-@@ -551,9 +606,9 @@
- 
-     void doKey(uchar scancode);
- 
--    
-+
-     void restoreLeds();
--    
-+
- private:
-     bool shift;
-     bool alt;
-@@ -809,7 +864,7 @@
- 
- #if !defined(QT_QWS_SL5XXX)
-     if (code == 224
--#if defined(QT_QWS_IPAQ) 
-+#if defined(QT_QWS_IPAQ)
- 	&& !ipaq_return_pressed
- #endif
- 	) {
-@@ -1775,9 +1830,11 @@
-     } else {
- 	type = spec;
-     }
--
-     if ( type == "Buttons" ) {
--#if defined(QT_QWS_YOPY)
-+#if defined(QT_QWS_SIMPAD)
-+	qDebug( "QWSKeyboardHandler: using SIMpad switches handler..." );
-+	handler = new QWSsimpadButtonsHandler();
-+#elif defined(QT_QWS_YOPY)
- 	handler = new QWSyopyButtonsHandler();
- #elif defined(QT_QWS_CASSIOPEIA)
- 	handler = new QWSVr41xxButtonsHandler();
-@@ -1812,6 +1869,218 @@
-     return keyM;
- }
- 
--#endif // QT_NO_QWS_KEYBOARD
- 
-+/*
-+ * SIMpad switches handler
-+ * (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
-+ */
-+
-+
-+QWSsimpadButtonsHandler::QWSsimpadButtonsHandler()
-+                        :QWSKeyboardHandler(), fd( -1 ),
-+                        repeatdelay( 700 ), repeatperiod( 80 ),
-+                        lastCode( 0 ), lastPress( 0 ),
-+                        k( -1 ), shiftKeyPressed( 0 ), shiftUsed( false )
-+{
-+    qDebug( "SimpadButtonsHandler() - V4.1" );
-+    fd = ::open( SIMPAD_SWITCHES_DEVICE, O_RDWR | O_NDELAY, 0 );
-+    if ( fd < 0 )
-+    {
-+        qWarning( "SimpadButtonsHandler(): can't open %s", SIMPAD_SWITCHES_DEVICE );
-+        return;
-+    }
-+
-+    notifier = new QSocketNotifier( fd, QSocketNotifier::Read, this );
-+    connect( notifier, SIGNAL( activated(int) ),this, SLOT( readSwitchesData() ) );
-+
-+    repeater = new QTimer(this);
-+    connect(repeater, SIGNAL(timeout()), this, SLOT(autoRepeat()));
-+
-+}
- 
-+
-+QWSsimpadButtonsHandler::~QWSsimpadButtonsHandler()
-+{
-+    qDebug( "~SimpadButtonsHandler()" );
-+    if ( fd > 0 )
-+    {
-+        ::close( fd );
-+        fd = -1;
-+    }
-+}
-+
-+
-+void QWSsimpadButtonsHandler::readSwitchesData()
-+{
-+    qDebug( "SimpadButtonsHandler() - detected switches action" );
-+
-+    if ( ::read( fd, &switches, sizeof switches ) < 0 )
-+    {
-+        qWarning( "SimpadButtonsHandler() - switches read error!" );
-+        return;
-+    }
-+
-+    qDebug( "SimpadButtonsHandler() - Shift: %0x [used: %0x] + Event = %0x | %0x",
-+            shiftKeyPressed, shiftUsed, switches.events[0], switches.states[0] );
-+
-+    bool press = switches.states[0]; // == switches.event[0];
-+    int code = switches.events[0];
-+
-+    //=========================================================================
-+
-+    /**
-+     * Work around a bug in the kernel keyboard driver emitting
-+     * bogus events when pressing multiple switches at once
-+     **/
-+
-+    if ( lastCode == 0 )
-+    {
-+        // first press ever
-+        eventTimer.start();
-+        lastPress = press;
-+        lastCode = code;
-+    }
-+    else
-+    {
-+        int interval = eventTimer.restart();
-+        qDebug( "event interval = %d", interval );
-+        if ( code == lastCode && interval < 10 )
-+        {
-+            qDebug( "event interval too small - ignoring bogus event" );
-+            qDebug( "did I say i hate buggy kernel drivers? :-D" );
-+            return;
-+        }
-+
-+        lastPress = press;
-+        lastCode = code;
-+    }
-+
-+    /**
-+     * Actually it may also be a hardware problem, but I really don't like
-+     * to review kernel code for further inquiry. So just being lazy and
-+     * do the workaround in user space :-D
-+     **/
-+
-+     //=====================================================================
-+
-+    if ( shiftKeyPressed )
-+    {
-+        // a shift key obviously is being held
-+        qDebug( "while shift key is being held..." );
-+
-+        if ( code != shiftKeyPressed )
-+        {
-+            // another key is being touched - that means shift mode for us!
-+            qDebug( "       another key is being touched -> shift use now = true" );
-+
-+            shiftUsed = true;
-+
-+            if ( shiftKeyPressed == SIMPAD_SWITCH_LOWER ) // SHIFT 1
-+            {
-+                qDebug( "           shift mode 1" );
-+                switch(code)
-+                {
-+                    case SIMPAD_SWITCH_UP:    k = Qt::Key_F9;  break; // Shift1-Up = Calendar
-+                    case SIMPAD_SWITCH_DOWN:  k = Qt::Key_F10; break; // Shift1-Down = Contacts
-+                    case SIMPAD_SWITCH_LEFT:  k = Qt::Key_F13; break; // Shift1-Left = Mail
-+                    case SIMPAD_SWITCH_RIGHT: k = Qt::Key_F11; break; // Shift1-Up = Menu
-+                    case SIMPAD_SWITCH_UPPER: k = Qt::Key_F12; break; // Shift1-Upper = Home
-+                    default: k=-1; qWarning( "SimpadButtonsHandler() - unhandled event for Shift 1 !" ); break;
-+                }
-+            }
-+            else if ( shiftKeyPressed == SIMPAD_SWITCH_UPPER ) // SHIFT 2
-+            {
-+                qDebug( "           shift mode 2" );
-+                switch(code)
-+                {
-+                    case SIMPAD_SWITCH_UP:    k = Qt::Key_F5; break;  // Shift2-Up = F5
-+                    case SIMPAD_SWITCH_DOWN:  k = Qt::Key_F6; break;  // Shift2-Down = F6
-+                    case SIMPAD_SWITCH_LEFT:  k = Qt::Key_F7; break;  // Shift2-Left = F7
-+                    case SIMPAD_SWITCH_RIGHT: k = Qt::Key_F8; break;  // Shift2-Up = F8
-+                    case SIMPAD_SWITCH_LOWER: k = Qt::Key_F9; break;  // Shift2-Lower = F9
-+                    default: k=-1; qWarning( "SimpadButtonsHandler() - unhandled event for Shift 2!" ); break;
-+                }
-+            }
-+        }
-+        else
-+        {
-+            qDebug( "       shift key has been released. checking if being used..." );
-+            shiftKeyPressed = 0;
-+
-+            if ( !shiftUsed )
-+            {
-+                qDebug( "       ... has _not_ being used -> really emit the key" );
-+                k = ( code == SIMPAD_SWITCH_UPPER ? Qt::Key_Escape : Qt::Key_Return );
-+                qDebug( "Emitting key = %d (pressed)", k );
-+                processKeyEvent( 0, k, 0, true, true );
-+                qDebug( "Emitting key = %d (released)", k );
-+                processKeyEvent( 0, k, 0, false, true );
-+                return;
-+            }
-+            else
-+            {
-+                qDebug( "       ... has being used -> doing nothing" );
-+                return;
-+            }
-+        }
-+    }
-+    else
-+    {
-+        qDebug( "standard mode - no shift yet..." );
-+
-+        switch(code)
-+        {
-+            case SIMPAD_SWITCH_UP:    k = Qt::Key_Up;       break;
-+            case SIMPAD_SWITCH_DOWN:  k = Qt::Key_Down;     break;
-+            case SIMPAD_SWITCH_LEFT:  k = Qt::Key_Left;     break;
-+            case SIMPAD_SWITCH_RIGHT: k = Qt::Key_Right;    break;
-+            case SIMPAD_SWITCH_POWER: k = Qt::Key_F34;      break; // Power Button
-+
-+            case SIMPAD_SWITCH_UPPER: k=-1; shiftKeyPressed = press? code:0; shiftUsed = false; qDebug( "shiftkey pressed now = %d", shiftKeyPressed ); return;
-+            case SIMPAD_SWITCH_LOWER: k=-1; shiftKeyPressed = press? code:0; shiftUsed = false; qDebug( "shiftkey pressed now = %d", shiftKeyPressed ); return;
-+
-+            default: k=-1; qWarning( "SimpadButtonsHandler() - unhandled event!" ); break;
-+        }
-+    }
-+
-+    if ( k == -1 )
-+    {
-+        qDebug( "no key to emit - returning." );
-+        return;
-+    }
-+
-+    bool repeatable = ( k == Qt::Key_Up || k == Qt::Key_Down ||
-+                        k == Qt::Key_Right || k == Qt::Key_Left );
-+
-+    qDebug( "key to emit = %d [%s] [repeat=%s]", k,
-+            press ? "press" : "release",
-+            repeatable ? "true":"false" );
-+
-+    if ( qt_screen->isTransformed() && k >= Qt::Key_Left && k <= Qt::Key_Down )
-+    {
-+        qDebug( "SimpadButtonsHandler() - We are transformed! Correcting..." );
-+        int oldK = k;
-+        k = xform_dirkey( k );
-+        qDebug( "SimpadButtonsHandler() - Old Key: %d - New Key %d", oldK, k );
-+    }
-+
-+    if ( repeatable && press )
-+        repeater->start( repeatdelay, true );
-+    else
-+        repeater->stop();
-+
-+    qwsServer->processKeyEvent( 0, k, 0, press, false );
-+}
-+
-+
-+void QWSsimpadButtonsHandler::autoRepeat()
-+{
-+    qDebug( "Emitting key = %d (released)", k );
-+    processKeyEvent( 0, k, 0, false, true );
-+    qDebug( "Emitting key = %d (pressed)", k );
-+    processKeyEvent( 0, k, 0, true, true );
-+    repeater->start(repeatperiod);
-+}
-+
-+
-+#endif // QT_NO_QWS_KEYBOARD
---- qt-2.3.10-snapshot-20050131/src/kernel/qsoundqss_qws.cpp~simpad
-+++ qt-2.3.10-snapshot-20050131/src/kernel/qsoundqss_qws.cpp
-@@ -53,8 +53,8 @@
- 
- extern int errno;
- 
--#define QT_QWS_SOUND_16BIT 1 // or 0, or undefined for always 0
--#define QT_QWS_SOUND_STEREO 1 // or 0, or undefined for always 0
-+#define QT_QWS_SOUND_16BIT 0 // or 0, or undefined for always 0
-+#define QT_QWS_SOUND_STEREO 0 // or 0, or undefined for always 0
- 
- // Zaurus SL5000D doesn't seem to return any error if setting to 44000 and it fails,
- // however 44100 works, 44100 is more common that 44000.
---- qt-2.3.10-snapshot-20050131/src/kernel/qwsmouse_qws.cpp~simpad
-+++ qt-2.3.10-snapshot-20050131/src/kernel/qwsmouse_qws.cpp
-@@ -47,6 +47,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/ioctl.h>
-+#include <sys/time.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-@@ -73,6 +74,7 @@
-         unsigned short x;
-         unsigned short y;
-         unsigned short pad;
-+        struct timeval stamp;
- } TS_EVENT;
- #elif defined(QT_QWS_SL5XXX)
- #define QT_QWS_SL5XXX_RAW
-@@ -1310,6 +1312,11 @@
-         return;
-      }
- # endif
-+#elif defined(QT_QWS_SIMPAD )
-+    if ((mouseFD = open( "/dev/touchscreen/ucb1x00", O_RDONLY | O_NONBLOCK )) < 0) {
-+         qWarning( "Cannot open /dev/touchscreen/ucb1x00 (%s)", strerror(errno));
-+         return;
-+    }
- #endif
- 
-     QSocketNotifier *mouseNotifier;
-@@ -1323,7 +1330,7 @@
- 
- QTPanelHandlerPrivate::~QTPanelHandlerPrivate()
- {
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
-+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD)
-     if (mouseFD >= 0)
- 	close(mouseFD);
- #endif
-@@ -1331,7 +1338,7 @@
- 
- void QTPanelHandlerPrivate::readMouseData()
- {
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
-+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD)
-     if(!qt_screen)
- 	return;
- 
-@@ -2014,7 +2021,7 @@
- 	    handler = new QTSLibHandlerPrivate();
- #elif defined(QT_QWS_YOPY)
- 	    handler = new QYopyTPanelHandlerPrivate(mouseProtocol,mouseDev);
--#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
-+#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD)
- 	    handler = new QTPanelHandlerPrivate(mouseProtocol,mouseDev);
- #elif defined(QT_QWS_CASSIOPEIA)
- 	    handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev );
diff --git a/packages/qte/qte-2.3.10-snapshot/beagle.patch b/packages/qte/qte-2.3.10/beagle.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/beagle.patch
+++ b/packages/qte/qte-2.3.10/beagle.patch
diff --git a/packages/qte/qte-2.3.10-snapshot/c700-hardware.patch b/packages/qte/qte-2.3.10/c700-hardware.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/c700-hardware.patch
+++ b/packages/qte/qte-2.3.10/c700-hardware.patch
diff --git a/packages/qte/qte-2.3.10-snapshot/daemonize.patch b/packages/qte/qte-2.3.10/daemonize.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/daemonize.patch
+++ b/packages/qte/qte-2.3.10/daemonize.patch
diff --git a/packages/qte/qte-2.3.10-snapshot/devfs.patch b/packages/qte/qte-2.3.10/devfs.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/devfs.patch
+++ b/packages/qte/qte-2.3.10/devfs.patch
diff --git a/packages/qte/qte-2.3.10-snapshot/encoding.patch b/packages/qte/qte-2.3.10/encoding.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/encoding.patch
+++ b/packages/qte/qte-2.3.10/encoding.patch
diff --git a/packages/qte/qte-2.3.10-snapshot/fix-qgfxraster.patch b/packages/qte/qte-2.3.10/fix-qgfxraster.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/fix-qgfxraster.patch
+++ b/packages/qte/qte-2.3.10/fix-qgfxraster.patch
diff --git a/packages/qte/qte-2.3.10-snapshot/gcc3.patch b/packages/qte/qte-2.3.10/gcc3.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/gcc3.patch
+++ b/packages/qte/qte-2.3.10/gcc3.patch
diff --git a/packages/qte/qte-2.3.10-snapshot/kernel-keymap-corgi.patch b/packages/qte/qte-2.3.10/kernel-keymap-corgi.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/kernel-keymap-corgi.patch
+++ b/packages/qte/qte-2.3.10/kernel-keymap-corgi.patch
diff --git a/packages/qte/qte-2.3.10-snapshot/kernel-keymap-tosa.patch b/packages/qte/qte-2.3.10/kernel-keymap-tosa.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/kernel-keymap-tosa.patch
+++ b/packages/qte/qte-2.3.10/kernel-keymap-tosa.patch
diff --git a/packages/qte/qte-2.3.10-snapshot/no-moc.patch b/packages/qte/qte-2.3.10/kernel-keymap.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/no-moc.patch
+++ b/packages/qte/qte-2.3.10/kernel-keymap.patch
diff --git a/packages/qte/qte-2.3.10-snapshot/qpe.patch b/packages/qte/qte-2.3.10/no-moc.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/qpe.patch
+++ b/packages/qte/qte-2.3.10/no-moc.patch
diff --git a/packages/qte/qte-2.3.10-snapshot/qt-visibility.patch b/packages/qte/qte-2.3.10/opie.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/qt-visibility.patch
+++ b/packages/qte/qte-2.3.10/opie.patch
diff --git a/packages/qte/qte-2.3.10-snapshot/sharp_char.h b/packages/qte/qte-2.3.10/qiconview-speed.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/sharp_char.h
+++ b/packages/qte/qte-2.3.10/qiconview-speed.patch
diff --git a/packages/qte/qte-2.3.10-snapshot/switches.h b/packages/qte/qte-2.3.10/qpe.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/switches.h
+++ b/packages/qte/qte-2.3.10/qpe.patch
diff --git a/packages/qte/qte-2.3.10-snapshot/tslib.patch b/packages/qte/qte-2.3.10/qt-visibility.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/tslib.patch
+++ b/packages/qte/qte-2.3.10/qt-visibility.patch
diff --git a/packages/qte/qte-2.3.10-snapshot/update-qtfontdir b/packages/qte/qte-2.3.10/sharp_char.h
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/update-qtfontdir
+++ b/packages/qte/qte-2.3.10/sharp_char.h
diff --git a/packages/qte/qte-2.3.10-snapshot/vt-switch.patch b/packages/qte/qte-2.3.10/simpad.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10-snapshot/vt-switch.patch
+++ b/packages/qte/qte-2.3.10/simpad.patch
diff --git a/packages/qte/qte-2.3.10/switches.h b/packages/qte/qte-2.3.10/switches.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-2.3.10/switches.h
diff --git a/packages/qte/qte-2.3.10/tslib.patch b/packages/qte/qte-2.3.10/tslib.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-2.3.10/tslib.patch
diff --git a/packages/qte/qte-2.3.10/update-qtfontdir b/packages/qte/qte-2.3.10/update-qtfontdir
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-2.3.10/update-qtfontdir
diff --git a/packages/qte/qte-2.3.10/vt-switch.patch b/packages/qte/qte-2.3.10/vt-switch.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-2.3.10/vt-switch.patch
diff --git a/packages/qte/qte-for-opie_2.3.10-snapshot-20050131.bb b/packages/qte/qte-for-opie_2.3.10-snapshot-20050131.bb
deleted file mode 100644
index 2f891fe093..0000000000
--- a/packages/qte/qte-for-opie_2.3.10-snapshot-20050131.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SECTION = "opie/base"
-include qte_2.3.10-snapshot.bb
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-2.3.10-snapshot"
-
-DESCRIPTION = "Qt/Embedded w/ Opie Patches version ${PV}"
-
-SRC_URI += "file://opie.patch;patch=1 \
-            file://qiconview-speed.patch;patch=1 "
diff --git a/packages/qte/qte-for-opie_2.3.10.bb b/packages/qte/qte-for-opie_2.3.10.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-for-opie_2.3.10.bb
diff --git a/packages/qte/qte_2.3.10-snapshot.bb b/packages/qte/qte_2.3.10-snapshot.bb
deleted file mode 100644
index dbf95841de..0000000000
--- a/packages/qte/qte_2.3.10-snapshot.bb
+++ /dev/null
@@ -1,194 +0,0 @@
-DESCRIPTION = "Qt/Embedded Version ${PV}"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "GPL QPL"
-DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
-PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r10"
-
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/snapshots/qt-embedded-${PV}.tar.gz \
-   	   file://qpe.patch;patch=1 \
-	   file://vt-switch.patch;patch=1 \
-	   file://daemonize.patch;patch=1 \
-	   file://no-moc.patch;patch=1 \
-	   file://gcc3.patch;patch=1 \
-	   file://c700-hardware.patch;patch=1 \
-	   file://encoding.patch;patch=1 \
-	   file://fix-qgfxraster.patch;patch=1 \
-	   file://qt-visibility.patch;patch=1 \
-	   file://tslib.patch;patch=1 \
-	   file://simpad.patch;patch=1 \
-	   file://update-qtfontdir \
-	   file://sharp_char.h \
-	   file://switches.h "
-
-SRC_URI_append_simpad   	= "file://devfs.patch;patch=1 "
-SRC_URI_append_corgi		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 "
-SRC_URI_append_shepherd		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 "
-SRC_URI_append_husky		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 "
-SRC_URI_append_tosa		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 "
-SRC_URI_append_beagle   	= "file://beagle.patch;patch=1 "
-SRC_URI_append_openzaurus-pxa-2.6 = "file://kernel-keymap.patch;patch=1 "
-
-S = "${WORKDIR}/qt-${PV}"
-
-export QTDIR = "${S}"
-
-def qte_arch(d):
-	import bb, re
-	arch = bb.data.getVar('TARGET_ARCH', d, 1)
-	if re.match("^i.86$", arch):
-		arch = "x86"
-	elif arch == "x86_64":
-		arch = "x86"
-	elif arch == "mipsel":
-		arch = "mips"
-	return arch
-
-QTE_ARCH := "${@qte_arch(d)}"
-
-EXTRA_OECONF_CONFIG = "-qconfig qpe"
-EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \
-		-xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32"
-EXTRA_OEMAKE = "-e"
-PARALLEL_MAKE = ""
-
-#
-# FIXME: Add more here
-#
-EXTRA_DEFINES 			= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE"
-EXTRA_DEFINES_collie 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_poodle		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_tosa		= "-DQT_QWS_TSLIB                 -DQT_QWS_SL5XXX -DQT_QWS_SL6000"
-EXTRA_DEFINES_h3600     	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" 
-EXTRA_DEFINES_h3900 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_jornada56x	= "-DQT_QWS_TSLIB                 -DQT_QWS_IPAQ"
-EXTRA_DEFINES_simpad		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_SIMPAD -DQT_QWS_DEVFS"
-EXTRA_DEFINES_corgi     	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_shepherd  	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_husky		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_beagle		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_BEAGLE"
-EXTRA_DEFINES_openzaurus-pxa-2.6= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700"
-
-export SYSCONF_CC = "${CC}"
-export SYSCONF_CXX = "${CXX}"
-export SYSCONF_LINK = "${CCLD}"
-export SYSCONF_SHLIB = "${CCLD}"
-export SYSCONF_CFLAGS = "${CFLAGS}"
-export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES}"
-#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES}"
-export SYSCONF_LFLAGS = "${LDFLAGS} -lts"
-export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
-export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
-
-do_configure() {
-	for f in ${S}/configs/linux-*-g++-shared; do
-		sed -e 's,-linux-,-linux-uclibc-,g' < $f \
-			> `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'`
-	done
-	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
-}
-
-do_compile() {
-	unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS
-	install -d include/asm/	
-	install -m 0644 ${WORKDIR}/sharp_char.h include/asm/
-	install -d include/linux/
-	install -m 0644 ${WORKDIR}/switches.h   include/linux/
-	oe_runmake
-}
-
-do_stage() {
-	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
-	oe_libinstall -so -C lib libqte ${STAGING_DIR}/${HOST_SYS}/qt2/lib
-	rm -f include/qxt.h
-	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
-	cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
-}
-
-do_install() {
-	install -d ${D}/${sbindir}/
-	install -m 0755 ${WORKDIR}/update-qtfontdir ${D}/${sbindir}/
-	install -d ${D}${palmtopdir}/lib/fonts/
-	oe_libinstall -so -C lib libqte ${D}/${palmtopdir}/lib
-	cp -a lib/fonts/* ${D}${palmtopdir}/lib/fonts/
-}
-
-pkg_postinst() {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-pkg_postinst_qte-font-unicode() {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-pkg_postinst_qte-font-lcd () {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-pkg_postinst_qte-font-japanese() {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-pkg_postinst_qte-font-micro() {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-pkg_postinst_qte-font-courier() {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-PACKAGES = "libqte2 qte-font-fixed qte-font-helvetica-small qte-font-helvetica-large \
-			qte-font-smoothtimes qte-font-smallsmooth qte-font-unicode qte-font-lcd \
-			qte-font-japanese qte-font-micro qte-font-courier"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-FILES_${PN} = ""
-FILES_libqte2 = "${palmtopdir}/lib/libqte.so* /usr/sbin/update-qtfontdir"
-FILES_qte-font-fixed = "${palmtopdir}/lib/fonts/fixed*"
-PACKAGE_ARCH_qte-font-fixed = "all"
-FILES_qte-font-helvetica-small = "${palmtopdir}/lib/fonts/helvetica_80*.qpf \
-	${palmtopdir}/lib/fonts/helvetica_100*.qpf ${palmtopdir}/lib/fonts/helvetica_120*.qpf"
-PACKAGE_ARCH_qte-font-helvetica-small = "all"
-FILES_qte-font-helvetica-large = "${palmtopdir}/lib/fonts/helvetica_140*.qpf \
-	${palmtopdir}/lib/fonts/helvetica_180*.qpf ${palmtopdir}/lib/fonts/helvetica_240*.qpf"
-PACKAGE_ARCH_qte-font-helvetica-large = "all"
-FILES_qte-font-smoothtimes = "${palmtopdir}/lib/fonts/smoothtimes*"
-PACKAGE_ARCH_qte-font-smoothtimes = "all"
-FILES_qte-font-smallsmooth = "${palmtopdir}/lib/fonts/smallsmooth*"
-PACKAGE_ARCH_qte-font-smallsmooth = "all"
-FILES_qte-font-unicode = "${palmtopdir}/lib/fonts/unifont*.qpf"
-PACKAGE_ARCH_qte-font-unicode = "all"
-FILES_qte-font-lcd = "${palmtopdir}/lib/fonts/lcd*"
-PACKAGE_ARCH_qte-font-lcd = "all"
-FILES_qte-font-japanese = "${palmtopdir}/lib/fonts/japanese*"
-PACKAGE_ARCH_qte-font-japanese = "all"
-FILES_qte-font-micro = "${palmtopdir}/lib/fonts/micro*.qpf"
-PACKAGE_ARCH_qte-font-micro = "all"
-FILES_qte-font-courier = "${palmtopdir}/lib/fonts/cour*"
-PACKAGE_ARCH_qte-font-courier = "all"
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte_2.3.10.bb