From a770e56eed977039457037380d810bfd0ab15e68 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Thu, 31 Mar 2005 22:56:27 +0000
Subject: Fix the qte compile on non-ipaq/zaurus platforms.  No idea if it
 actually works though, just tested compilation.

BKrev: 424c801blxzszVCnCSPvZJ1KKd4z2g
---
 packages/qte/qte-2.3.10/key.patch | 23 +++++++++++++++++------
 packages/qte/qte_2.3.10.bb        |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'packages')

diff --git a/packages/qte/qte-2.3.10/key.patch b/packages/qte/qte-2.3.10/key.patch
index c89f893517..9092accd2c 100644
--- a/packages/qte/qte-2.3.10/key.patch
+++ b/packages/qte/qte-2.3.10/key.patch
@@ -3,8 +3,10 @@
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
 #
 
---- qt-2.3.10/src/kernel/qkeyboard_qws.cpp~key	2005-03-19 15:44:15.120219000 +0100
-+++ qt-2.3.10/src/kernel/qkeyboard_qws.cpp	2005-03-19 15:43:43.247892000 +0100
+Index: qt-2.3.10/src/kernel/qkeyboard_qws.cpp
+===================================================================
+--- qt-2.3.10.orig/src/kernel/qkeyboard_qws.cpp	2005-03-31 17:51:14.978609000 -0500
++++ qt-2.3.10/src/kernel/qkeyboard_qws.cpp	2005-03-31 17:54:28.140243968 -0500
 @@ -848,6 +848,9 @@
      bool release = false;
      int keypad = 0;
@@ -25,7 +27,7 @@
  #if defined(QT_QWS_IPAQ)
  	switch (code) {
  #if defined(QT_QWS_SL5XXX)
-@@ -1061,18 +1061,14 @@
+@@ -1061,25 +1061,23 @@
  	    repeatable = FALSE;
  #endif
  
@@ -46,7 +48,16 @@
  #endif
  	/*
  	  Translate shift+Key_Tab to Key_Backtab
-@@ -1234,6 +1230,14 @@
+ 	*/
+ 	if (( keyCode == Key_Tab ) && shift )
+ 	    keyCode = Key_Backtab;
++#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
+     }
++#endif
+ 
+ #ifndef QT_QWS_USE_KEYCODES
+     /*
+@@ -1234,6 +1232,14 @@
  	} else {
  	    prevkey = prevuni = 0;
  	}
@@ -61,7 +72,7 @@
      }
  #ifndef QT_QWS_USE_KEYCODES
      extended = 0;
-@@ -2056,6 +2060,7 @@
+@@ -2056,6 +2062,7 @@
              press ? "press" : "release",
              repeatable ? "true":"false" );
  
@@ -69,7 +80,7 @@
      if ( qt_screen->isTransformed() && k >= Qt::Key_Left && k <= Qt::Key_Down )
      {
          qDebug( "SimpadButtonsHandler() - We are transformed! Correcting..." );
-@@ -2063,6 +2068,7 @@
+@@ -2063,6 +2070,7 @@
          k = xform_dirkey( k );
          qDebug( "SimpadButtonsHandler() - Old Key: %d - New Key %d", oldK, k );
      }
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index 3a8a28fefc..ec25152603 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL QPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
 DEPENDS_ramses = "zlib libpng jpeg uicmoc-native"
 PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
    	   file://qpe.patch;patch=1 \
-- 
cgit v1.2.3