2 files changed, 3 insertions, 3 deletions
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,33 +1,33 @@
 #############################################################################
 ####### 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
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/keyboard/Makefile.in b/inputmethods/keyboard/Makefile.in index 3631807..16fdcb7 100644 --- a/inputmethods/keyboard/Makefile.in +++ b/inputmethods/keyboard/Makefile.in
@@ -1,33 +1,33 @@
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


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