8 files changed, 12 insertions, 12 deletions
diff --git a/inputmethods/handwriting/Makefile.in b/inputmethods/handwriting/Makefile.in
index aabb5aa..cd2b47c 100644
--- a/inputmethods/handwriting/Makefile.in
+++ b/inputmethods/handwriting/Makefile.in
@@ -1,57 +1,57 @@
 #############################################################################
 ####### Compiler, tools and options
        CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
        CC      =$(SYSCONF_CC) $(QT_C_MT)
        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
        LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
        LIBS    =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
        MOC     =$(SYSCONF_MOC)
        UIC     =$(SYSCONF_UIC)
 ####### Target
 DESTDIR = ../../plugins/inputmethods/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
        TARGET= qhandwriting
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 ####### Files
        HEADERS =qimpenchar.h \
                qimpenprofile.h \
                qimpencombining.h \
                qimpenhelp.h \
                qimpeninput.h \
                qimpenmatch.h \
                qimpensetup.h \
                qimpenstroke.h \
                qimpenwidget.h \
                qimpenwordpick.h \
                handwritingimpl.h
        SOURCES =qimpenchar.cpp \
                qimpenprofile.cpp \
                qimpencombining.cpp \
                qimpenhelp.cpp \
                qimpeninput.cpp \
                qimpenmatch.cpp \
                qimpensetup.cpp \
                qimpenstroke.cpp \
                qimpenwidget.cpp \
                qimpenwordpick.cpp \
                handwritingimpl.cpp
        OBJECTS =qimpenchar.o \
                qimpenprofile.o \
                qimpencombining.o \
                qimpenhelp.o \
                qimpeninput.o \
                qimpenmatch.o \
                qimpensetup.o \
                qimpenstroke.o \
                qimpenwidget.o \
                qimpenwordpick.o \
diff --git a/inputmethods/handwriting/handwriting.pro b/inputmethods/handwriting/handwriting.pro
index 999552b..9bccbb9 100644
--- a/inputmethods/handwriting/handwriting.pro
+++ b/inputmethods/handwriting/handwriting.pro
@@ -1,33 +1,33 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   qimpenchar.h \
            qimpenprofile.h \
            qimpencombining.h \
            qimpenhelp.h \
            qimpeninput.h \
            qimpenmatch.h \
            qimpensetup.h \
            qimpenstroke.h \
            qimpenwidget.h \
            qimpenwordpick.h \
            handwritingimpl.h
        SOURCES=   qimpenchar.cpp \
            qimpenprofile.cpp \
            qimpencombining.cpp \
            qimpenhelp.cpp \
            qimpeninput.cpp \
            qimpenmatch.cpp \
            qimpensetup.cpp \
            qimpenstroke.cpp \
            qimpenwidget.cpp \
            qimpenwordpick.cpp \
            handwritingimpl.cpp
 INTERFACES = qimpenprefbase.ui
        TARGET  = qhandwriting
        DESTDIR         = ../../plugins/inputmethods
-INCLUDEPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH      += ../$(QPEDIR)/include ../../taskbar
+DEPENDPATH      += ../$(OPIEDIR)/include ../../taskbar
 LIBS            += -lqpe
        VERSION         = 1.0.0
 TRANSLATIONS += ../../i18n/de/libqhandwriting.ts
diff --git a/inputmethods/keyboard/Makefile.in b/inputmethods/keyboard/Makefile.in
index 3631807..16fdcb7 100644
--- a/inputmethods/keyboard/Makefile.in
+++ b/inputmethods/keyboard/Makefile.in
@@ -1,57 +1,57 @@
 #############################################################################
 ####### Compiler, tools and options
        CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
        CC      =$(SYSCONF_CC) $(QT_C_MT)
        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
        LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
        LIBS    =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
        MOC     =$(SYSCONF_MOC)
        UIC     =$(SYSCONF_UIC)
 ####### Target
 DESTDIR = ../../plugins/inputmethods/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
        TARGET= qkeyboard
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 ####### Files
        HEADERS =keyboard.h \
                ../pickboard/pickboardcfg.h \
                ../pickboard/pickboardpicks.h \
                keyboardimpl.h
        SOURCES =keyboard.cpp \
                ../pickboard/pickboardcfg.cpp \
                ../pickboard/pickboardpicks.cpp \
                keyboardimpl.cpp
        OBJECTS =keyboard.o \
                ../pickboard/pickboardcfg.o \
                ../pickboard/pickboardpicks.o \
                keyboardimpl.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
        SRCMOC  =moc_keyboard.cpp \
                ../pickboard/moc_pickboardcfg.cpp \
                ../pickboard/moc_pickboardpicks.cpp
        OBJMOC  =moc_keyboard.o \
                ../pickboard/moc_pickboardcfg.o \
                ../pickboard/moc_pickboardpicks.o
 ####### Implicit rules
 .SUFFIXES: .cpp .cxx .cc .C .c
 .cpp.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cxx.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro
index 87c838e..6e9df79 100644
--- a/inputmethods/keyboard/keyboard.pro
+++ b/inputmethods/keyboard/keyboard.pro
@@ -1,18 +1,18 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   keyboard.h \
            ../pickboard/pickboardcfg.h \
            ../pickboard/pickboardpicks.h \
            keyboardimpl.h 
        SOURCES=   keyboard.cpp \
            ../pickboard/pickboardcfg.cpp \
            ../pickboard/pickboardpicks.cpp \
            keyboardimpl.cpp
        TARGET  = qkeyboard
        DESTDIR         = ../../plugins/inputmethods
-INCLUDEPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH      += ../$(QPEDIR)/include ../../taskbar
+DEPENDPATH      += ../$(OPIEDIR)/include ../../taskbar
 LIBS            += -lqpe
        VERSION         = 1.0.0
 TRANSLATIONS += ../../i18n/de/libqkeyboard.ts
diff --git a/inputmethods/pickboard/Makefile.in b/inputmethods/pickboard/Makefile.in
index d72e82d..44310a4 100644
--- a/inputmethods/pickboard/Makefile.in
+++ b/inputmethods/pickboard/Makefile.in
@@ -1,57 +1,57 @@
 #############################################################################
 ####### Compiler, tools and options
        CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
        CC      =$(SYSCONF_CC) $(QT_C_MT)
        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
        LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
        LIBS    =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
        MOC     =$(SYSCONF_MOC)
        UIC     =$(SYSCONF_UIC)
 ####### Target
 DESTDIR = ../../plugins/inputmethods/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
        TARGET= qpickboard
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 ####### Files
        HEADERS =pickboard.h \
                pickboardcfg.h \
                pickboardimpl.h \
                pickboardpicks.h
        SOURCES =pickboard.cpp \
                pickboardcfg.cpp \
                pickboardimpl.cpp \
                pickboardpicks.cpp
        OBJECTS =pickboard.o \
                pickboardcfg.o \
                pickboardimpl.o \
                pickboardpicks.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
        SRCMOC  =moc_pickboard.cpp \
                moc_pickboardcfg.cpp \
                moc_pickboardpicks.cpp
        OBJMOC  =moc_pickboard.o \
                moc_pickboardcfg.o \
                moc_pickboardpicks.o
 ####### Implicit rules
 .SUFFIXES: .cpp .cxx .cc .C .c
 .cpp.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cxx.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
diff --git a/inputmethods/pickboard/pickboard.pro b/inputmethods/pickboard/pickboard.pro
index 50bc342..ad86370 100644
--- a/inputmethods/pickboard/pickboard.pro
+++ b/inputmethods/pickboard/pickboard.pro
@@ -1,12 +1,12 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   pickboard.h pickboardcfg.h pickboardimpl.h pickboardpicks.h
        SOURCES=   pickboard.cpp pickboardcfg.cpp pickboardimpl.cpp pickboardpicks.cpp
        TARGET  = qpickboard
        DESTDIR         = ../../plugins/inputmethods
-INCLUDEPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH      += ../$(QPEDIR)/include ../../taskbar
+DEPENDPATH      += ../$(OPIEDIR)/include ../../taskbar
 LIBS            += -lqpe
        VERSION         = 1.0.0
 TRANSLATIONS += ../../i18n/de/libqpickboard.ts
diff --git a/inputmethods/unikeyboard/Makefile.in b/inputmethods/unikeyboard/Makefile.in
index ebbab50..f64d6c8 100644
--- a/inputmethods/unikeyboard/Makefile.in
+++ b/inputmethods/unikeyboard/Makefile.in
@@ -1,57 +1,57 @@
 #############################################################################
 ####### Compiler, tools and options
        CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
        CC      =$(SYSCONF_CC) $(QT_C_MT)
        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
        LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
        LIBS    =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
        MOC     =$(SYSCONF_MOC)
        UIC     =$(SYSCONF_UIC)
 ####### Target
 DESTDIR = ../../plugins/inputmethods/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
        TARGET= qunikeyboard
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 ####### Files
        HEADERS =unikeyboard.h \
                unikeyboardimpl.h
        SOURCES =unikeyboard.cpp \
                unikeyboardimpl.cpp
        OBJECTS =unikeyboard.o \
                unikeyboardimpl.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
        SRCMOC  =moc_unikeyboard.cpp
        OBJMOC  =moc_unikeyboard.o
 ####### Implicit rules
 .SUFFIXES: .cpp .cxx .cc .C .c
 .cpp.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cxx.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cc.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .C.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .c.o:
        $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
diff --git a/inputmethods/unikeyboard/unikeyboard.pro b/inputmethods/unikeyboard/unikeyboard.pro
index c0aad42..509db07 100644
--- a/inputmethods/unikeyboard/unikeyboard.pro
+++ b/inputmethods/unikeyboard/unikeyboard.pro
@@ -1,12 +1,12 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   unikeyboard.h unikeyboardimpl.h
        SOURCES=   unikeyboard.cpp unikeyboardimpl.cpp
        TARGET  = qunikeyboard
        DESTDIR         = ../../plugins/inputmethods
-INCLUDEPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH      += ../$(QPEDIR)/include ../../taskbar
+DEPENDPATH      += ../$(OPIEDIR)/include ../../taskbar
 LIBS            += -lqpe
        VERSION         = 1.0.0
 TRANSLATIONS += ../../i18n/de/libqunikeyboard.ts

diff --git a/inputmethods/handwriting/Makefile.in b/inputmethods/handwriting/Makefile.in index aabb5aa..cd2b47c 100644 --- a/inputmethods/handwriting/Makefile.in +++ b/inputmethods/handwriting/Makefile.in
@@ -1,57 +1,57 @@
1	#############################################################################	1	#############################################################################
2		2
3	####### Compiler, tools and options	3	####### Compiler, tools and options
4		4
5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)	5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)	6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7	CC =$(SYSCONF_CC) $(QT_C_MT)	7	CC =$(SYSCONF_CC) $(QT_C_MT)
8	CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)	8	CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9	INCPATH =-I$(QPEDIR)/include	9	INCPATH =-I$(OPIEDIR)/include
10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)	10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11	LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)	11	LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12	MOC =$(SYSCONF_MOC)	12	MOC =$(SYSCONF_MOC)
13	UIC =$(SYSCONF_UIC)	13	UIC =$(SYSCONF_UIC)
14		14
15	####### Target	15	####### Target
16		16
17	DESTDIR = ../../plugins/inputmethods/	17	DESTDIR = ../../plugins/inputmethods/
18	VER_MAJ = 1	18	VER_MAJ = 1
19	VER_MIN = 0	19	VER_MIN = 0
20	VER_PATCH = 0	20	VER_PATCH = 0
21	TARGET= qhandwriting	21	TARGET= qhandwriting
22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)	22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23		23
24	####### Files	24	####### Files
25		25
26	HEADERS =qimpenchar.h \	26	HEADERS =qimpenchar.h \
27	qimpenprofile.h \	27	qimpenprofile.h \
28	qimpencombining.h \	28	qimpencombining.h \
29	qimpenhelp.h \	29	qimpenhelp.h \
30	qimpeninput.h \	30	qimpeninput.h \
31	qimpenmatch.h \	31	qimpenmatch.h \
32	qimpensetup.h \	32	qimpensetup.h \
33	qimpenstroke.h \	33	qimpenstroke.h \
34	qimpenwidget.h \	34	qimpenwidget.h \
35	qimpenwordpick.h \	35	qimpenwordpick.h \
36	handwritingimpl.h	36	handwritingimpl.h
37	SOURCES =qimpenchar.cpp \	37	SOURCES =qimpenchar.cpp \
38	qimpenprofile.cpp \	38	qimpenprofile.cpp \
39	qimpencombining.cpp \	39	qimpencombining.cpp \
40	qimpenhelp.cpp \	40	qimpenhelp.cpp \
41	qimpeninput.cpp \	41	qimpeninput.cpp \
42	qimpenmatch.cpp \	42	qimpenmatch.cpp \
43	qimpensetup.cpp \	43	qimpensetup.cpp \
44	qimpenstroke.cpp \	44	qimpenstroke.cpp \
45	qimpenwidget.cpp \	45	qimpenwidget.cpp \
46	qimpenwordpick.cpp \	46	qimpenwordpick.cpp \
47	handwritingimpl.cpp	47	handwritingimpl.cpp
48	OBJECTS =qimpenchar.o \	48	OBJECTS =qimpenchar.o \
49	qimpenprofile.o \	49	qimpenprofile.o \
50	qimpencombining.o \	50	qimpencombining.o \
51	qimpenhelp.o \	51	qimpenhelp.o \
52	qimpeninput.o \	52	qimpeninput.o \
53	qimpenmatch.o \	53	qimpenmatch.o \
54	qimpensetup.o \	54	qimpensetup.o \
55	qimpenstroke.o \	55	qimpenstroke.o \
56	qimpenwidget.o \	56	qimpenwidget.o \
57	qimpenwordpick.o \	57	qimpenwordpick.o \


diff --git a/inputmethods/handwriting/handwriting.pro b/inputmethods/handwriting/handwriting.pro index 999552b..9bccbb9 100644 --- a/inputmethods/handwriting/handwriting.pro +++ b/inputmethods/handwriting/handwriting.pro
@@ -1,33 +1,33 @@
1	TEMPLATE= lib	1	TEMPLATE= lib
2	CONFIG += qt warn_on release	2	CONFIG += qt warn_on release
3	HEADERS= qimpenchar.h \	3	HEADERS= qimpenchar.h \
4	qimpenprofile.h \	4	qimpenprofile.h \
5	qimpencombining.h \	5	qimpencombining.h \
6	qimpenhelp.h \	6	qimpenhelp.h \
7	qimpeninput.h \	7	qimpeninput.h \
8	qimpenmatch.h \	8	qimpenmatch.h \
9	qimpensetup.h \	9	qimpensetup.h \
10	qimpenstroke.h \	10	qimpenstroke.h \
11	qimpenwidget.h \	11	qimpenwidget.h \
12	qimpenwordpick.h \	12	qimpenwordpick.h \
13	handwritingimpl.h	13	handwritingimpl.h
14	SOURCES= qimpenchar.cpp \	14	SOURCES= qimpenchar.cpp \
15	qimpenprofile.cpp \	15	qimpenprofile.cpp \
16	qimpencombining.cpp \	16	qimpencombining.cpp \
17	qimpenhelp.cpp \	17	qimpenhelp.cpp \
18	qimpeninput.cpp \	18	qimpeninput.cpp \
19	qimpenmatch.cpp \	19	qimpenmatch.cpp \
20	qimpensetup.cpp \	20	qimpensetup.cpp \
21	qimpenstroke.cpp \	21	qimpenstroke.cpp \
22	qimpenwidget.cpp \	22	qimpenwidget.cpp \
23	qimpenwordpick.cpp \	23	qimpenwordpick.cpp \
24	handwritingimpl.cpp	24	handwritingimpl.cpp
25	INTERFACES = qimpenprefbase.ui	25	INTERFACES = qimpenprefbase.ui
26	TARGET = qhandwriting	26	TARGET = qhandwriting
27	DESTDIR = ../../plugins/inputmethods	27	DESTDIR = ../../plugins/inputmethods
28	INCLUDEPATH += $(QPEDIR)/include	28	INCLUDEPATH += $(OPIEDIR)/include
29	DEPENDPATH += ../$(QPEDIR)/include ../../taskbar	29	DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
30	LIBS += -lqpe	30	LIBS += -lqpe
31	VERSION = 1.0.0	31	VERSION = 1.0.0
32		32
33	TRANSLATIONS += ../../i18n/de/libqhandwriting.ts	33	TRANSLATIONS += ../../i18n/de/libqhandwriting.ts


diff --git a/inputmethods/keyboard/Makefile.in b/inputmethods/keyboard/Makefile.in index 3631807..16fdcb7 100644 --- a/inputmethods/keyboard/Makefile.in +++ b/inputmethods/keyboard/Makefile.in
@@ -1,57 +1,57 @@
1	#############################################################################	1	#############################################################################
2		2
3	####### Compiler, tools and options	3	####### Compiler, tools and options
4		4
5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)	5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)	6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7	CC =$(SYSCONF_CC) $(QT_C_MT)	7	CC =$(SYSCONF_CC) $(QT_C_MT)
8	CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)	8	CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9	INCPATH =-I$(QPEDIR)/include	9	INCPATH =-I$(OPIEDIR)/include
10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)	10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11	LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)	11	LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12	MOC =$(SYSCONF_MOC)	12	MOC =$(SYSCONF_MOC)
13	UIC =$(SYSCONF_UIC)	13	UIC =$(SYSCONF_UIC)
14		14
15	####### Target	15	####### Target
16		16
17	DESTDIR = ../../plugins/inputmethods/	17	DESTDIR = ../../plugins/inputmethods/
18	VER_MAJ = 1	18	VER_MAJ = 1
19	VER_MIN = 0	19	VER_MIN = 0
20	VER_PATCH = 0	20	VER_PATCH = 0
21	TARGET= qkeyboard	21	TARGET= qkeyboard
22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)	22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23		23
24	####### Files	24	####### Files
25		25
26	HEADERS =keyboard.h \	26	HEADERS =keyboard.h \
27	../pickboard/pickboardcfg.h \	27	../pickboard/pickboardcfg.h \
28	../pickboard/pickboardpicks.h \	28	../pickboard/pickboardpicks.h \
29	keyboardimpl.h	29	keyboardimpl.h
30	SOURCES =keyboard.cpp \	30	SOURCES =keyboard.cpp \
31	../pickboard/pickboardcfg.cpp \	31	../pickboard/pickboardcfg.cpp \
32	../pickboard/pickboardpicks.cpp \	32	../pickboard/pickboardpicks.cpp \
33	keyboardimpl.cpp	33	keyboardimpl.cpp
34	OBJECTS =keyboard.o \	34	OBJECTS =keyboard.o \
35	../pickboard/pickboardcfg.o \	35	../pickboard/pickboardcfg.o \
36	../pickboard/pickboardpicks.o \	36	../pickboard/pickboardpicks.o \
37	keyboardimpl.o	37	keyboardimpl.o
38	INTERFACES =	38	INTERFACES =
39	UICDECLS =	39	UICDECLS =
40	UICIMPLS =	40	UICIMPLS =
41	SRCMOC =moc_keyboard.cpp \	41	SRCMOC =moc_keyboard.cpp \
42	../pickboard/moc_pickboardcfg.cpp \	42	../pickboard/moc_pickboardcfg.cpp \
43	../pickboard/moc_pickboardpicks.cpp	43	../pickboard/moc_pickboardpicks.cpp
44	OBJMOC =moc_keyboard.o \	44	OBJMOC =moc_keyboard.o \
45	../pickboard/moc_pickboardcfg.o \	45	../pickboard/moc_pickboardcfg.o \
46	../pickboard/moc_pickboardpicks.o	46	../pickboard/moc_pickboardpicks.o
47		47
48		48
49	####### Implicit rules	49	####### Implicit rules
50		50
51	.SUFFIXES: .cpp .cxx .cc .C .c	51	.SUFFIXES: .cpp .cxx .cc .C .c
52		52
53	.cpp.o:	53	.cpp.o:
54	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	54	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
55		55
56	.cxx.o:	56	.cxx.o:
57	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	57	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<


diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro index 87c838e..6e9df79 100644 --- a/inputmethods/keyboard/keyboard.pro +++ b/inputmethods/keyboard/keyboard.pro
@@ -1,18 +1,18 @@
1	TEMPLATE= lib	1	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 \	4	../pickboard/pickboardcfg.h \
5	../pickboard/pickboardpicks.h \	5	../pickboard/pickboardpicks.h \
6	keyboardimpl.h	6	keyboardimpl.h
7	SOURCES= keyboard.cpp \	7	SOURCES= keyboard.cpp \
8	../pickboard/pickboardcfg.cpp \	8	../pickboard/pickboardcfg.cpp \
9	../pickboard/pickboardpicks.cpp \	9	../pickboard/pickboardpicks.cpp \
10	keyboardimpl.cpp	10	keyboardimpl.cpp
11	TARGET = qkeyboard	11	TARGET = qkeyboard
12	DESTDIR = ../../plugins/inputmethods	12	DESTDIR = ../../plugins/inputmethods
13	INCLUDEPATH += $(QPEDIR)/include	13	INCLUDEPATH += $(OPIEDIR)/include
14	DEPENDPATH += ../$(QPEDIR)/include ../../taskbar	14	DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
15	LIBS += -lqpe	15	LIBS += -lqpe
16	VERSION = 1.0.0	16	VERSION = 1.0.0
17		17
18	TRANSLATIONS += ../../i18n/de/libqkeyboard.ts	18	TRANSLATIONS += ../../i18n/de/libqkeyboard.ts


diff --git a/inputmethods/pickboard/Makefile.in b/inputmethods/pickboard/Makefile.in index d72e82d..44310a4 100644 --- a/inputmethods/pickboard/Makefile.in +++ b/inputmethods/pickboard/Makefile.in
@@ -1,57 +1,57 @@
1	#############################################################################	1	#############################################################################
2		2
3	####### Compiler, tools and options	3	####### Compiler, tools and options
4		4
5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)	5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)	6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7	CC =$(SYSCONF_CC) $(QT_C_MT)	7	CC =$(SYSCONF_CC) $(QT_C_MT)
8	CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)	8	CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9	INCPATH =-I$(QPEDIR)/include	9	INCPATH =-I$(OPIEDIR)/include
10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)	10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11	LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)	11	LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12	MOC =$(SYSCONF_MOC)	12	MOC =$(SYSCONF_MOC)
13	UIC =$(SYSCONF_UIC)	13	UIC =$(SYSCONF_UIC)
14		14
15	####### Target	15	####### Target
16		16
17	DESTDIR = ../../plugins/inputmethods/	17	DESTDIR = ../../plugins/inputmethods/
18	VER_MAJ = 1	18	VER_MAJ = 1
19	VER_MIN = 0	19	VER_MIN = 0
20	VER_PATCH = 0	20	VER_PATCH = 0
21	TARGET= qpickboard	21	TARGET= qpickboard
22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)	22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23		23
24	####### Files	24	####### Files
25		25
26	HEADERS =pickboard.h \	26	HEADERS =pickboard.h \
27	pickboardcfg.h \	27	pickboardcfg.h \
28	pickboardimpl.h \	28	pickboardimpl.h \
29	pickboardpicks.h	29	pickboardpicks.h
30	SOURCES =pickboard.cpp \	30	SOURCES =pickboard.cpp \
31	pickboardcfg.cpp \	31	pickboardcfg.cpp \
32	pickboardimpl.cpp \	32	pickboardimpl.cpp \
33	pickboardpicks.cpp	33	pickboardpicks.cpp
34	OBJECTS =pickboard.o \	34	OBJECTS =pickboard.o \
35	pickboardcfg.o \	35	pickboardcfg.o \
36	pickboardimpl.o \	36	pickboardimpl.o \
37	pickboardpicks.o	37	pickboardpicks.o
38	INTERFACES =	38	INTERFACES =
39	UICDECLS =	39	UICDECLS =
40	UICIMPLS =	40	UICIMPLS =
41	SRCMOC =moc_pickboard.cpp \	41	SRCMOC =moc_pickboard.cpp \
42	moc_pickboardcfg.cpp \	42	moc_pickboardcfg.cpp \
43	moc_pickboardpicks.cpp	43	moc_pickboardpicks.cpp
44	OBJMOC =moc_pickboard.o \	44	OBJMOC =moc_pickboard.o \
45	moc_pickboardcfg.o \	45	moc_pickboardcfg.o \
46	moc_pickboardpicks.o	46	moc_pickboardpicks.o
47		47
48		48
49	####### Implicit rules	49	####### Implicit rules
50		50
51	.SUFFIXES: .cpp .cxx .cc .C .c	51	.SUFFIXES: .cpp .cxx .cc .C .c
52		52
53	.cpp.o:	53	.cpp.o:
54	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	54	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
55		55
56	.cxx.o:	56	.cxx.o:
57	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	57	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<


diff --git a/inputmethods/pickboard/pickboard.pro b/inputmethods/pickboard/pickboard.pro index 50bc342..ad86370 100644 --- a/inputmethods/pickboard/pickboard.pro +++ b/inputmethods/pickboard/pickboard.pro
@@ -1,12 +1,12 @@
1	TEMPLATE= lib	1	TEMPLATE= lib
2	CONFIG += qt warn_on release	2	CONFIG += qt warn_on release
3	HEADERS= pickboard.h pickboardcfg.h pickboardimpl.h pickboardpicks.h	3	HEADERS= pickboard.h pickboardcfg.h pickboardimpl.h pickboardpicks.h
4	SOURCES= pickboard.cpp pickboardcfg.cpp pickboardimpl.cpp pickboardpicks.cpp	4	SOURCES= pickboard.cpp pickboardcfg.cpp pickboardimpl.cpp pickboardpicks.cpp
5	TARGET = qpickboard	5	TARGET = qpickboard
6	DESTDIR = ../../plugins/inputmethods	6	DESTDIR = ../../plugins/inputmethods
7	INCLUDEPATH += $(QPEDIR)/include	7	INCLUDEPATH += $(OPIEDIR)/include
8	DEPENDPATH += ../$(QPEDIR)/include ../../taskbar	8	DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
9	LIBS += -lqpe	9	LIBS += -lqpe
10	VERSION = 1.0.0	10	VERSION = 1.0.0
11		11
12	TRANSLATIONS += ../../i18n/de/libqpickboard.ts	12	TRANSLATIONS += ../../i18n/de/libqpickboard.ts


diff --git a/inputmethods/unikeyboard/Makefile.in b/inputmethods/unikeyboard/Makefile.in index ebbab50..f64d6c8 100644 --- a/inputmethods/unikeyboard/Makefile.in +++ b/inputmethods/unikeyboard/Makefile.in
@@ -1,57 +1,57 @@
1	#############################################################################	1	#############################################################################
2		2
3	####### Compiler, tools and options	3	####### Compiler, tools and options
4		4
5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)	5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)	6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7	CC =$(SYSCONF_CC) $(QT_C_MT)	7	CC =$(SYSCONF_CC) $(QT_C_MT)
8	CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)	8	CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9	INCPATH =-I$(QPEDIR)/include	9	INCPATH =-I$(OPIEDIR)/include
10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)	10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11	LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)	11	LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12	MOC =$(SYSCONF_MOC)	12	MOC =$(SYSCONF_MOC)
13	UIC =$(SYSCONF_UIC)	13	UIC =$(SYSCONF_UIC)
14		14
15	####### Target	15	####### Target
16		16
17	DESTDIR = ../../plugins/inputmethods/	17	DESTDIR = ../../plugins/inputmethods/
18	VER_MAJ = 1	18	VER_MAJ = 1
19	VER_MIN = 0	19	VER_MIN = 0
20	VER_PATCH = 0	20	VER_PATCH = 0
21	TARGET= qunikeyboard	21	TARGET= qunikeyboard
22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)	22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23		23
24	####### Files	24	####### Files
25		25
26	HEADERS =unikeyboard.h \	26	HEADERS =unikeyboard.h \
27	unikeyboardimpl.h	27	unikeyboardimpl.h
28	SOURCES =unikeyboard.cpp \	28	SOURCES =unikeyboard.cpp \
29	unikeyboardimpl.cpp	29	unikeyboardimpl.cpp
30	OBJECTS =unikeyboard.o \	30	OBJECTS =unikeyboard.o \
31	unikeyboardimpl.o	31	unikeyboardimpl.o
32	INTERFACES =	32	INTERFACES =
33	UICDECLS =	33	UICDECLS =
34	UICIMPLS =	34	UICIMPLS =
35	SRCMOC =moc_unikeyboard.cpp	35	SRCMOC =moc_unikeyboard.cpp
36	OBJMOC =moc_unikeyboard.o	36	OBJMOC =moc_unikeyboard.o
37		37
38		38
39	####### Implicit rules	39	####### Implicit rules
40		40
41	.SUFFIXES: .cpp .cxx .cc .C .c	41	.SUFFIXES: .cpp .cxx .cc .C .c
42		42
43	.cpp.o:	43	.cpp.o:
44	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	44	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
45		45
46	.cxx.o:	46	.cxx.o:
47	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	47	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
48		48
49	.cc.o:	49	.cc.o:
50	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	50	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51		51
52	.C.o:	52	.C.o:
53	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	53	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54		54
55	.c.o:	55	.c.o:
56	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<	56	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
57		57


diff --git a/inputmethods/unikeyboard/unikeyboard.pro b/inputmethods/unikeyboard/unikeyboard.pro index c0aad42..509db07 100644 --- a/inputmethods/unikeyboard/unikeyboard.pro +++ b/inputmethods/unikeyboard/unikeyboard.pro
@@ -1,12 +1,12 @@
1	TEMPLATE= lib	1	TEMPLATE= lib
2	CONFIG += qt warn_on release	2	CONFIG += qt warn_on release
3	HEADERS= unikeyboard.h unikeyboardimpl.h	3	HEADERS= unikeyboard.h unikeyboardimpl.h
4	SOURCES= unikeyboard.cpp unikeyboardimpl.cpp	4	SOURCES= unikeyboard.cpp unikeyboardimpl.cpp
5	TARGET = qunikeyboard	5	TARGET = qunikeyboard
6	DESTDIR = ../../plugins/inputmethods	6	DESTDIR = ../../plugins/inputmethods
7	INCLUDEPATH += $(QPEDIR)/include	7	INCLUDEPATH += $(OPIEDIR)/include
8	DEPENDPATH += ../$(QPEDIR)/include ../../taskbar	8	DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
9	LIBS += -lqpe	9	LIBS += -lqpe
10	VERSION = 1.0.0	10	VERSION = 1.0.0
11		11
12	TRANSLATIONS += ../../i18n/de/libqunikeyboard.ts	12	TRANSLATIONS += ../../i18n/de/libqunikeyboard.ts