diff options
| author | Holger Freyther <zecke@selfish.org> | 2004-09-21 19:16:12 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2004-09-21 19:16:12 +0000 |
| commit | 7de6c3ee3f5ed88682b2c0a47f552bde7383c4de (patch) | |
| tree | c7342b667d13691e65115f7c2402048bdb4b2713 /qte | |
| parent | 0e35ac022f9b29f977501d82540e7e9a8ebe2070 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into handhelds.org:/home/ich/programming/oe/oe-packages-exported
2004/09/21 21:15:28+02:00 handhelds.org!zecke
The last missing s/1.1.5-cvs/1.1.6-cvs replacement for Opie Packages
2004/09/21 21:07:01+02:00 handhelds.org!zecke
Beagle Runtime Updates
to make suspend/resume work, and Opie
BKrev: 41507dfcCWRO89hr02rLbWeCVQSOag
Diffstat (limited to 'qte')
| -rw-r--r-- | qte/qte-2.3.7/beagle.patch | 45 | ||||
| -rw-r--r-- | qte/qte_2.3.7.oe | 8 |
2 files changed, 51 insertions, 2 deletions
diff --git a/qte/qte-2.3.7/beagle.patch b/qte/qte-2.3.7/beagle.patch index e69de29bb2..88c3f94c1c 100644 --- a/qte/qte-2.3.7/beagle.patch +++ b/qte/qte-2.3.7/beagle.patch @@ -0,0 +1,45 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~beagle.patch ++++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp +@@ -350,6 +350,11 @@ + { Qt::Key_F12, 0xffff , 0xffff , 0xffff }, + { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, + { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 90 ++#ifdef QT_QWS_BEAGLE ++ { Qt::Key_F13, 0xffff, 0xffff, 0xffff }, // lightning ++ { Qt::Key_Up, 0xffff, 0xffff, 0xffff }, // Wheel Up ++ { Qt::Key_Down, 0xffff, 0xffff, 0xffff }, // Wheel Down ++#endif + { 0, 0xffff , 0xffff , 0xffff } + }; + #endif +@@ -406,7 +411,7 @@ + qwsServer->processKeyEvent( unicode, keycode, modifiers, isPress, autoRepeat ); + } + +-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) ++#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_BEAGLE) + #define QT_QWS_AUTOREPEAT_MANUALLY + #endif + +@@ -791,13 +796,15 @@ + bool repeatable = TRUE; + + #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) && !defined(QT_QWS_CUSTOM) ++#warning "Compiling in Keyboard code" + switch (code) { + case 0x7a: case 0x7b: case 0x7c: case 0x7d: + keyCode = code - 0x7a + Key_F9; + repeatable = FALSE; + break; + case 0x79: +- keyCode = Key_SysReq; ++ qWarning("Keyboard Power Button activated!"); ++ keyCode = Key_F34; // Power Button on Beagle + repeatable = FALSE; + break; + case 0x78: diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe index 71270d34e1..6df2b972cb 100644 --- a/qte/qte_2.3.7.oe +++ b/qte/qte_2.3.7.oe @@ -27,7 +27,7 @@ SRC_URI_append_h3900 = "file://devfs.patch;patch=1 " SRC_URI_append_corgi = "file://kernel-keymap.patch;patch=1 " SRC_URI_append_shepherd = "file://kernel-keymap.patch;patch=1 " SRC_URI_append_husky = "file://kernel-keymap.patch;patch=1 " -SRC_URI_append_beagle = "file://devfs.patch;patch=1 file://beagle.patch;patch=1 " +SRC_URI_append_beagle = "file://beagle.patch;patch=1 " S = "${WORKDIR}/qt-${PV}" @@ -50,6 +50,10 @@ 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 16,32" EXTRA_OEMAKE = "-e" +EXTRA_OECONF_beagle = "-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 " # # FIXME: Add more here @@ -63,7 +67,7 @@ EXTRA_DEFINES_simpad = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPA EXTRA_DEFINES_corgi = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" EXTRA_DEFINES_shepherd = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" EXTRA_DEFINES_husky = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" -EXTRA_DEFINES_beagle = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_DEVFS" +EXTRA_DEFINES_beagle = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_BEAGLE" export SYSCONF_CC = "${CC}" export SYSCONF_CXX = "${CXX}" |