summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-07-20 00:47:05 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-07-20 00:47:05 +0000
commit44b1f3ef2d0ab249de7d6a45e133a58144856b51 (patch)
treed024805f6a0dcbef014570ab4986730be748fe3f /packages
parent45d02219335cb1e07d463e08175c24d173bc726a (diff)
parent983ceee8cfcb81a9daa190e48b015a49b3193f06 (diff)
merge of '1e9c9dd7a2daad928434f6b4164d901c32c1b304'
and '4d3e78f093ecab2572e31e122da26f729409dee5'
Diffstat (limited to 'packages')
-rw-r--r--packages/qte/qte-common_2.3.10.inc9
-rw-r--r--packages/qte/qte-mt_2.3.10.bb2
2 files changed, 4 insertions, 7 deletions
diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index 7f87684c5e..fa9ddaea7a 100644
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -46,6 +46,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m
file://kernel-keymap.patch;patch=1 \
file://kernel-keymap-corgi.patch;patch=1 \
file://kernel-asm-page.patch;patch=1 \
+ file://remove-unused-kbdhandler.patch;patch=1 \
file://sharp_char.h \
file://switches.h "
@@ -87,12 +88,8 @@ EXTRA_OEMAKE = "-e"
# add device flags here
#
EXTRA_DEFINES = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
-EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
-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_CUSTOM -DQT_QWS_SL5XXX"
+EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SLCXK"
+EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SLCXK"
#
# don't touch anything below here
diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb
index 1c44a65442..0af996559e 100644
--- a/packages/qte/qte-mt_2.3.10.bb
+++ b/packages/qte/qte-mt_2.3.10.bb
@@ -1,5 +1,5 @@
require qte-common_${PV}.inc
-PR = "r23"
+PR = "r24"
EXTRA_OECONF += "-thread"