diff options
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar.inc | 9 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar_cvs.bb | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc index 450e4b4617..aea8ff3486 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -7,15 +7,6 @@ APPNAME = "qpe" S = "${WORKDIR}/launcher" -# Caps/Numlock icons for devices with keyboard -EXTRA_QMAKEVARS_POST_append_collie = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_poodle = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_c7x0 = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_tosa = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_spitz = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_akita = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_htcuniversal= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" - # Wallpaper and welcome splash PIXMAP_SIZE = "" PIXMAP_SIZE_c7x0 = "-640x480" diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 423deb3955..7db76aa8dd 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r9" +PR = "r10" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ @@ -11,5 +11,6 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/etc \ file://nomax.patch;patch=1;pnum=3 \ file://no-builtin-qss-startup.patch;patch=1 \ + file://kbdlocks-runtime.patch;patch=1 \ file://server.pro \ " |