author | simon <simon> | 2002-11-24 10:36:54 (UTC) |
---|---|---|
committer | simon <simon> | 2002-11-24 10:36:54 (UTC) |
commit | 9387bc3f63b1e48c559d0758c50d9af857e7feeb (patch) (unidiff) | |
tree | 13318ea1c82fcdb54790af111537ca00708746f3 /inputmethods/keyboard | |
parent | 83a6751b29b0a7e77d09477880cdc16e14dfe0a1 (diff) | |
download | opie-9387bc3f63b1e48c559d0758c50d9af857e7feeb.zip opie-9387bc3f63b1e48c559d0758c50d9af857e7feeb.tar.gz opie-9387bc3f63b1e48c559d0758c50d9af857e7feeb.tar.bz2 |
- link multikey, dvorak and keyboard input method against pickboard
(and updated ipkg dependencies accordingly) , to avoid duplicated
symbols at run-time (patch posted on opie list a couple of days ago)
-rw-r--r-- | inputmethods/keyboard/keyboard.pro | 6 | ||||
-rw-r--r-- | inputmethods/keyboard/opie-keyboard.control | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro index 105316f..540d177 100644 --- a/inputmethods/keyboard/keyboard.pro +++ b/inputmethods/keyboard/keyboard.pro | |||
@@ -2,10 +2,6 @@ TEMPLATE = lib | |||
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS= keyboard.h \ | 3 | HEADERS= keyboard.h \ |
4 | ../pickboard/pickboardcfg.h \ | ||
5 | ../pickboard/pickboardpicks.h \ | ||
6 | keyboardimpl.h | 4 | keyboardimpl.h |
7 | SOURCES= keyboard.cpp \ | 5 | SOURCES= keyboard.cpp \ |
8 | ../pickboard/pickboardcfg.cpp \ | ||
9 | ../pickboard/pickboardpicks.cpp \ | ||
10 | keyboardimpl.cpp | 6 | keyboardimpl.cpp |
11 | TARGET = qkeyboard | 7 | TARGET = qkeyboard |
@@ -13,5 +9,5 @@ DESTDIR = ../../plugins/inputmethods | |||
13 | INCLUDEPATH += $(OPIEDIR)/include | 9 | INCLUDEPATH += $(OPIEDIR)/include |
14 | DEPENDPATH += ../$(OPIEDIR)/include ../../launcher | 10 | DEPENDPATH += ../$(OPIEDIR)/include ../../launcher |
15 | LIBS += -lqpe | 11 | LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard |
16 | VERSION = 1.0.0 | 12 | VERSION = 1.0.0 |
17 | 13 | ||
diff --git a/inputmethods/keyboard/opie-keyboard.control b/inputmethods/keyboard/opie-keyboard.control index cd60148..2a6b7a5 100644 --- a/inputmethods/keyboard/opie-keyboard.control +++ b/inputmethods/keyboard/opie-keyboard.control | |||
@@ -5,5 +5,5 @@ Maintainer: Martin Jones <mjones@trolltech.com> | |||
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION | 6 | Version: $QPE_VERSION-$SUB_VERSION |
7 | Depends: opie-base ($QPE_VERSION) | 7 | Depends: opie-base ($QPE_VERSION) opie-pickboard |
8 | Description: Keyboard input method | 8 | Description: Keyboard input method |
9 | Keyboard input method for the Opie environment. | 9 | Keyboard input method for the Opie environment. |