Committing in .

Modified Files:
	configure mkipks addressbook/Makefile.in
	addressbook/addressbook.pro calc2/calc.pro
	calc2/binary/binary.pro calc2/simple/simple.pro
	calculator/Makefile.in calculator/calculator.pro
	cardmon/Makefile.in cardmon/cardmon.pro chess/chess.pro
	citytime/Makefile.in citytime/citytime.pro clock/Makefile.in
	clock/clock.pro datebook/Makefile.in datebook/datebook.pro
	dictionary/dictionary.pro doc/qcop.doc doc/start.doc
	embeddedkonsole/Makefile.in
	embeddedkonsole/embeddedkonsole.pro etc/init.d/qpe
	example/example.pro fifteen/Makefile.in fifteen/fifteen.pro
	filebrowser/Makefile.in filebrowser/filebrowser.pro
	freetype/freetype.pro go/Makefile.in go/go.pro
	helpbrowser/Makefile.in helpbrowser/helpbrowser.pro
	inputmethods/handwriting/Makefile.in
	inputmethods/handwriting/handwriting.pro
	inputmethods/keyboard/Makefile.in
	inputmethods/keyboard/keyboard.pro
	inputmethods/pickboard/Makefile.in
	inputmethods/pickboard/pickboard.pro
	inputmethods/unikeyboard/Makefile.in
	inputmethods/unikeyboard/unikeyboard.pro keypebble/Makefile.in
	keypebble/keypebble.pro library/Makefile.in library/global.cpp
	library/library.pro library/qpeapplication.cpp
	mindbreaker/Makefile.in mindbreaker/mindbreaker.pro
	minesweep/Makefile.in minesweep/minesweep.pro
	mpegplayer/Makefile.in mpegplayer/mpegplayer.pro
	mpegplayer/libflash/libflash.pro mpegplayer/libmad/Makefile.in
	mpegplayer/libmad/libmad.pro mpegplayer/libmpeg3/Makefile.in
	mpegplayer/libmpeg3/libmpeg3.pro
	mpegplayer/libmpeg3/audio/Makefile
	mpegplayer/libmpeg3/video/Makefile
	mpegplayer/wavplugin/Makefile.in
	mpegplayer/wavplugin/wavplugin.pro netsetup/Makefile.in
	netsetup/README netsetup/netsetup.pro
	netsetup/dialup/Makefile.in netsetup/dialup/dialup.pro
	netsetup/lan/Makefile.in netsetup/lan/lan.pro
	parashoot/Makefile.in parashoot/parashoot.pro
	qasteroids/Makefile.in qasteroids/qasteroids.pro
	qcop/Makefile.in qcop/qcop.pro qipkg/Makefile.in
	qipkg/qipkg.pro scripts/q_functions
	settings/appearance/Makefile.in
	settings/appearance/appearance.pro
	settings/language/Makefile.in settings/language/language.pro
	settings/light-and-power/Makefile.in
	settings/light-and-power/light-and-power.pro
	settings/rotation/Makefile.in settings/rotation/rotation.pro
	settings/security/Makefile.in settings/security/security.pro
	settings/sound/Makefile.in settings/sound/sound.pro
	settings/systemtime/Makefile.in
	settings/systemtime/systemtime.pro showimg/Makefile.in
	showimg/showimg.pro single/Makefile.in single/single.pro
	snake/Makefile.in snake/snake.pro solitaire/Makefile.in
	solitaire/solitaire.pro spreadsheet/Makefile.in
	spreadsheet/spreadsheet.pro sysinfo/Makefile.in
	sysinfo/sysinfo.pro tableviewer/tableviewer.pro
	taskbar/Makefile.in taskbar/main.cpp taskbar/taskbar.pro
	taskbar/batteryapplet/Makefile.in
	taskbar/batteryapplet/batteryapplet.pro
	taskbar/clipboardapplet/clipboardapplet.pro
	taskbar/clockapplet/Makefile.in
	taskbar/clockapplet/clockapplet.pro
	taskbar/netmonapplet/Makefile.in
	taskbar/netmonapplet/netmonapplet.pro
	taskbar/volumeapplet/Makefile.in
	taskbar/volumeapplet/volumeapplet.pro tetrix/Makefile.in
	tetrix/tetrix.pro textedit/Makefile.in textedit/textedit.pro
	todo/Makefile.in todo/todo.pro tux/Makefile.in tux/tux.pro
	website/htdocs/build.html website/htdocs/development.html
	website/htdocs/refman/qcop.html
	website/htdocs/refman/qpeapplication.html wordgame/Makefile.in
	wordgame/wordgame.pro
Log Message:
	Changed QPEDIR to OPIEDIR in .pro files, and documentation,
	and regenerated all Makefile.in's that were affected.

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,281 +1,281 @@
 #############################################################################
 
 ####### 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 \
 		handwritingimpl.o \
 		qimpenprefbase.o
 INTERFACES =    qimpenprefbase.ui
 UICDECLS =      qimpenprefbase.h
 UICIMPLS =      qimpenprefbase.cpp
 SRCMOC	=	moc_qimpenhelp.cpp \
 		moc_qimpeninput.cpp \
 		moc_qimpenmatch.cpp \
 		moc_qimpensetup.cpp \
 		moc_qimpenwidget.cpp \
 		moc_qimpenwordpick.cpp \
 		moc_qimpenprefbase.cpp
 OBJMOC	=	moc_qimpenhelp.o \
 		moc_qimpeninput.o \
 		moc_qimpenmatch.o \
 		moc_qimpensetup.o \
 		moc_qimpenwidget.o \
 		moc_qimpenwordpick.o \
 		moc_qimpenprefbase.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 $@ $<
 
 ####### Build rules
 
 
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK_LIB)
 
 moc: $(SRCMOC)
 
 tmake:
 	tmake handwriting.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 qimpenchar.o: qimpenchar.cpp \
 		qimpencombining.h \
 		qimpenchar.h \
 		qimpenstroke.h
 
 qimpenprofile.o: qimpenprofile.cpp \
 		qimpencombining.h \
 		qimpenchar.h \
 		qimpenstroke.h \
 		qimpenprofile.h
 
 qimpencombining.o: qimpencombining.cpp \
 		qimpencombining.h \
 		qimpenchar.h \
 		qimpenstroke.h
 
 qimpenhelp.o: qimpenhelp.cpp \
 		qimpenwidget.h \
 		qimpenchar.h \
 		qimpenstroke.h \
 		qimpencombining.h \
 		qimpenmatch.h \
 		qimpenhelp.h \
 		qimpenprofile.h
 
 qimpeninput.o: qimpeninput.cpp \
 		qimpenwidget.h \
 		qimpenchar.h \
 		qimpenstroke.h \
 		qimpensetup.h \
 		qimpenprofile.h \
 		qimpeninput.h \
 		qimpencombining.h \
 		qimpenwordpick.h \
 		qimpenmatch.h \
 		qimpenhelp.h
 
 qimpenmatch.o: qimpenmatch.cpp \
 		qimpenmatch.h \
 		qimpenchar.h \
 		qimpenstroke.h
 
 qimpensetup.o: qimpensetup.cpp \
 		qimpenwidget.h \
 		qimpenchar.h \
 		qimpenstroke.h \
 		qimpenprefbase.h \
 		qimpensetup.h \
 		qimpenprofile.h
 
 qimpenstroke.o: qimpenstroke.cpp \
 		qimpenstroke.h
 
 qimpenwidget.o: qimpenwidget.cpp \
 		qimpenchar.h \
 		qimpenstroke.h \
 		qimpenwidget.h
 
 qimpenwordpick.o: qimpenwordpick.cpp \
 		qimpenwordpick.h \
 		qimpenmatch.h \
 		qimpenchar.h \
 		qimpenstroke.h
 
 handwritingimpl.o: handwritingimpl.cpp \
 		qimpeninput.h \
 		qimpenprofile.h \
 		qimpenchar.h \
 		qimpenstroke.h \
 		handwritingimpl.h
 
 qimpenprefbase.h: qimpenprefbase.ui
 	$(UIC) qimpenprefbase.ui -o $(INTERFACE_DECL_PATH)/qimpenprefbase.h
 
 qimpenprefbase.cpp: qimpenprefbase.ui
 	$(UIC) qimpenprefbase.ui -i qimpenprefbase.h -o qimpenprefbase.cpp
 
 qimpenprefbase.o: qimpenprefbase.cpp \
 		qimpenprefbase.h \
 		qimpenprefbase.ui
 
 moc_qimpenhelp.o: moc_qimpenhelp.cpp \
 		qimpenhelp.h \
 		qimpenchar.h \
 		qimpenstroke.h \
 		qimpenprofile.h
 
 moc_qimpeninput.o: moc_qimpeninput.cpp \
 		qimpeninput.h \
 		qimpenprofile.h \
 		qimpenchar.h \
 		qimpenstroke.h
 
 moc_qimpenmatch.o: moc_qimpenmatch.cpp \
 		qimpenmatch.h \
 		qimpenchar.h \
 		qimpenstroke.h
 
 moc_qimpensetup.o: moc_qimpensetup.cpp \
 		qimpensetup.h \
 		qimpenprofile.h \
 		qimpenchar.h \
 		qimpenstroke.h
 
 moc_qimpenwidget.o: moc_qimpenwidget.cpp \
 		qimpenwidget.h \
 		qimpenchar.h \
 		qimpenstroke.h
 
 moc_qimpenwordpick.o: moc_qimpenwordpick.cpp \
 		qimpenwordpick.h \
 		qimpenmatch.h \
 		qimpenchar.h \
 		qimpenstroke.h
 
 moc_qimpenprefbase.o: moc_qimpenprefbase.cpp \
 		qimpenprefbase.h
 
 moc_qimpenhelp.cpp: qimpenhelp.h
 	$(MOC) qimpenhelp.h -o moc_qimpenhelp.cpp
 
 moc_qimpeninput.cpp: qimpeninput.h
 	$(MOC) qimpeninput.h -o moc_qimpeninput.cpp
 
 moc_qimpenmatch.cpp: qimpenmatch.h
 	$(MOC) qimpenmatch.h -o moc_qimpenmatch.cpp
 
 moc_qimpensetup.cpp: qimpensetup.h
 	$(MOC) qimpensetup.h -o moc_qimpensetup.cpp
 
 moc_qimpenwidget.cpp: qimpenwidget.h
 	$(MOC) qimpenwidget.h -o moc_qimpenwidget.cpp
 
 moc_qimpenwordpick.cpp: qimpenwordpick.h
 	$(MOC) qimpenwordpick.h -o moc_qimpenwordpick.cpp
 
 moc_qimpenprefbase.cpp: qimpenprefbase.h
 	$(MOC) qimpenprefbase.h -o moc_qimpenprefbase.cpp
 
 
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
-DEPENDPATH      += ../$(QPEDIR)/include ../../taskbar
+INCLUDEPATH += $(OPIEDIR)/include
+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,151 +1,151 @@
 #############################################################################
 
 ####### 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 $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK_LIB)
 
 moc: $(SRCMOC)
 
 tmake:
 	tmake keyboard.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 keyboard.o: keyboard.cpp \
 		keyboard.h \
 		../pickboard/pickboardcfg.h \
 		../pickboard/pickboardpicks.h
 
 ../pickboard/pickboardcfg.o: ../pickboard/pickboardcfg.cpp \
 		../pickboard/pickboardcfg.h \
 		../pickboard/pickboardpicks.h
 
 ../pickboard/pickboardpicks.o: ../pickboard/pickboardpicks.cpp \
 		../pickboard/pickboardpicks.h \
 		../pickboard/pickboardcfg.h
 
 keyboardimpl.o: keyboardimpl.cpp \
 		keyboard.h \
 		../pickboard/pickboardcfg.h \
 		../pickboard/pickboardpicks.h \
 		keyboardimpl.h
 
 moc_keyboard.o: moc_keyboard.cpp \
 		keyboard.h \
 		../pickboard/pickboardcfg.h \
 		../pickboard/pickboardpicks.h
 
 ../pickboard/moc_pickboardcfg.o: ../pickboard/moc_pickboardcfg.cpp \
 		../pickboard/pickboardcfg.h
 
 ../pickboard/moc_pickboardpicks.o: ../pickboard/moc_pickboardpicks.cpp \
 		../pickboard/pickboardpicks.h
 
 moc_keyboard.cpp: keyboard.h
 	$(MOC) keyboard.h -o moc_keyboard.cpp
 
 ../pickboard/moc_pickboardcfg.cpp: ../pickboard/pickboardcfg.h
 	$(MOC) ../pickboard/pickboardcfg.h -o ../pickboard/moc_pickboardcfg.cpp
 
 ../pickboard/moc_pickboardpicks.cpp: ../pickboard/pickboardpicks.h
 	$(MOC) ../pickboard/pickboardpicks.h -o ../pickboard/moc_pickboardpicks.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
-DEPENDPATH      += ../$(QPEDIR)/include ../../taskbar
+INCLUDEPATH += $(OPIEDIR)/include
+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,147 +1,147 @@
 #############################################################################
 
 ####### 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 $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK_LIB)
 
 moc: $(SRCMOC)
 
 tmake:
 	tmake pickboard.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 pickboard.o: pickboard.cpp \
 		pickboard.h \
 		pickboardpicks.h \
 		pickboardcfg.h
 
 pickboardcfg.o: pickboardcfg.cpp \
 		pickboardcfg.h \
 		pickboardpicks.h
 
 pickboardimpl.o: pickboardimpl.cpp \
 		pickboard.h \
 		pickboardimpl.h
 
 pickboardpicks.o: pickboardpicks.cpp \
 		pickboardpicks.h \
 		pickboardcfg.h
 
 moc_pickboard.o: moc_pickboard.cpp \
 		pickboard.h
 
 moc_pickboardcfg.o: moc_pickboardcfg.cpp \
 		pickboardcfg.h
 
 moc_pickboardpicks.o: moc_pickboardpicks.cpp \
 		pickboardpicks.h
 
 moc_pickboard.cpp: pickboard.h
 	$(MOC) pickboard.h -o moc_pickboard.cpp
 
 moc_pickboardcfg.cpp: pickboardcfg.h
 	$(MOC) pickboardcfg.h -o moc_pickboardcfg.cpp
 
 moc_pickboardpicks.cpp: pickboardpicks.h
 	$(MOC) pickboardpicks.h -o moc_pickboardpicks.cpp
 
 
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
-DEPENDPATH      += ../$(QPEDIR)/include ../../taskbar
+INCLUDEPATH += $(OPIEDIR)/include
+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,115 +1,115 @@
 #############################################################################
 
 ####### 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 $@ $<
 
 ####### Build rules
 
 
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK_LIB)
 
 moc: $(SRCMOC)
 
 tmake:
 	tmake unikeyboard.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 unikeyboard.o: unikeyboard.cpp \
 		unikeyboard.h
 
 unikeyboardimpl.o: unikeyboardimpl.cpp \
 		unikeyboard.h \
 		unikeyboardimpl.h
 
 moc_unikeyboard.o: moc_unikeyboard.cpp \
 		unikeyboard.h
 
 moc_unikeyboard.cpp: unikeyboard.h
 	$(MOC) unikeyboard.h -o moc_unikeyboard.cpp
 
 
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
-DEPENDPATH      += ../$(QPEDIR)/include ../../taskbar
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += ../$(OPIEDIR)/include ../../taskbar
 LIBS            += -lqpe
 VERSION		= 1.0.0
 
 TRANSLATIONS += ../../i18n/de/libqunikeyboard.ts