Major pro file overhaul from davipt. Commited by me, since it touches

many core files ... please report bugs on this to davipt

7 files changed, 98 insertions, 117 deletions

diff --git a/inputmethods/dvorak/dvorak.pro b/inputmethods/dvorak/dvorak.pro
index 3ad6e07..5c14761 100644
--- a/inputmethods/dvorak/dvorak.pro
+++ b/inputmethods/dvorak/dvorak.pro
@@ -1,34 +1,31 @@
 TEMPLATE	= lib
 CONFIG		+= qt warn_on release
 HEADERS	=   dvorak.h \
 	    ../pickboard/pickboardcfg.h \
 	    ../pickboard/pickboardpicks.h \
 	    dvorakimpl.h 
 SOURCES	=   dvorak.cpp \
 	    ../pickboard/pickboardcfg.cpp \
 	    ../pickboard/pickboardpicks.cpp \
 	    dvorakimpl.cpp
 TARGET		= qdvorak
 DESTDIR		= ../../plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
 LIBS            += -lqpe
 VERSION		= 1.0.0
 
-
-
-TRANSLATIONS = ../../i18n/de/libqdvorak.ts
-TRANSLATIONS += ../../i18n/en/libqdvorak.ts
-TRANSLATIONS += ../../i18n/es/libqdvorak.ts
-TRANSLATIONS += ../../i18n/fr/libqdvorak.ts
-TRANSLATIONS += ../../i18n/hu/libqdvorak.ts
-TRANSLATIONS += ../../i18n/ja/libqdvorak.ts
-TRANSLATIONS += ../../i18n/ko/libqdvorak.ts
-TRANSLATIONS += ../../i18n/no/libqdvorak.ts
-TRANSLATIONS += ../../i18n/pl/libqdvorak.ts
-TRANSLATIONS += ../../i18n/pt/libqdvorak.ts
-TRANSLATIONS += ../../i18n/pt_BR/libqdvorak.ts
-TRANSLATIONS += ../../i18n/sl/libqdvorak.ts
-TRANSLATIONS += ../../i18n/zh_CN/libqdvorak.ts
-TRANSLATIONS += ../../i18n/zh_TW/libqdvorak.ts
-
+TRANSLATIONS = ../../i18n/de/libqdvorak.ts \
+	 ../../i18n/en/libqdvorak.ts \
+	 ../../i18n/es/libqdvorak.ts \
+	 ../../i18n/fr/libqdvorak.ts \
+	 ../../i18n/hu/libqdvorak.ts \
+	 ../../i18n/ja/libqdvorak.ts \
+	 ../../i18n/ko/libqdvorak.ts \
+	 ../../i18n/no/libqdvorak.ts \
+	 ../../i18n/pl/libqdvorak.ts \
+	 ../../i18n/pt/libqdvorak.ts \
+	 ../../i18n/pt_BR/libqdvorak.ts \
+	 ../../i18n/sl/libqdvorak.ts \
+	 ../../i18n/zh_CN/libqdvorak.ts \
+	 ../../i18n/zh_TW/libqdvorak.ts
diff --git a/inputmethods/handwriting/handwriting.pro b/inputmethods/handwriting/handwriting.pro
index a8bcda7..b4a742d 100644
--- a/inputmethods/handwriting/handwriting.pro
+++ b/inputmethods/handwriting/handwriting.pro
@@ -1,49 +1,46 @@
 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 += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
 LIBS            += -lqpe
 VERSION		= 1.0.0
 
-
-
-TRANSLATIONS = ../../i18n/de/libqhandwriting.ts
-TRANSLATIONS += ../../i18n/en/libqhandwriting.ts
-TRANSLATIONS += ../../i18n/es/libqhandwriting.ts
-TRANSLATIONS += ../../i18n/fr/libqhandwriting.ts
-TRANSLATIONS += ../../i18n/hu/libqhandwriting.ts
-TRANSLATIONS += ../../i18n/ja/libqhandwriting.ts
-TRANSLATIONS += ../../i18n/ko/libqhandwriting.ts
-TRANSLATIONS += ../../i18n/no/libqhandwriting.ts
-TRANSLATIONS += ../../i18n/pl/libqhandwriting.ts
-TRANSLATIONS += ../../i18n/pt/libqhandwriting.ts
-TRANSLATIONS += ../../i18n/pt_BR/libqhandwriting.ts
-TRANSLATIONS += ../../i18n/sl/libqhandwriting.ts
-TRANSLATIONS += ../../i18n/zh_CN/libqhandwriting.ts
-TRANSLATIONS += ../../i18n/zh_TW/libqhandwriting.ts
-
+TRANSLATIONS = ../../i18n/de/libqhandwriting.ts \
+	 ../../i18n/en/libqhandwriting.ts \
+	 ../../i18n/es/libqhandwriting.ts \
+	 ../../i18n/fr/libqhandwriting.ts \
+	 ../../i18n/hu/libqhandwriting.ts \
+	 ../../i18n/ja/libqhandwriting.ts \
+	 ../../i18n/ko/libqhandwriting.ts \
+	 ../../i18n/no/libqhandwriting.ts \
+	 ../../i18n/pl/libqhandwriting.ts \
+	 ../../i18n/pt/libqhandwriting.ts \
+	 ../../i18n/pt_BR/libqhandwriting.ts \
+	 ../../i18n/sl/libqhandwriting.ts \
+	 ../../i18n/zh_CN/libqhandwriting.ts \
+	 ../../i18n/zh_TW/libqhandwriting.ts
diff --git a/inputmethods/jumpx/jumpx.pro b/inputmethods/jumpx/jumpx.pro
index 101ae49..d8d123c 100644
--- a/inputmethods/jumpx/jumpx.pro
+++ b/inputmethods/jumpx/jumpx.pro
@@ -1,29 +1,27 @@
 TEMPLATE        = lib
 CONFIG         += qt warn_on release
 HEADERS         = keyboard.h \
 	          keyboardimpl.h
 SOURCES         = keyboard.cpp \
                   keyboardimpl.cpp
 TARGET          = qjumpx
 DESTDIR         = ../../plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS           += -lqpe
 VERSION         = 1.0.0
 
-
-TRANSLATIONS = ../../i18n/de/libqjumpx.ts
-TRANSLATIONS += ../../i18n/en/libqjumpx.ts
-TRANSLATIONS += ../../i18n/es/libqjumpx.ts
-TRANSLATIONS += ../../i18n/fr/libqjumpx.ts
-TRANSLATIONS += ../../i18n/hu/libqjumpx.ts
-TRANSLATIONS += ../../i18n/ja/libqjumpx.ts
-TRANSLATIONS += ../../i18n/ko/libqjumpx.ts
-TRANSLATIONS += ../../i18n/no/libqjumpx.ts
-TRANSLATIONS += ../../i18n/pl/libqjumpx.ts
-TRANSLATIONS += ../../i18n/pt/libqjumpx.ts
-TRANSLATIONS += ../../i18n/pt_BR/libqjumpx.ts
-TRANSLATIONS += ../../i18n/sl/libqjumpx.ts
-TRANSLATIONS += ../../i18n/zh_CN/libqjumpx.ts
-TRANSLATIONS += ../../i18n/zh_TW/libqjumpx.ts
-
+TRANSLATIONS = ../../i18n/de/libqjumpx.ts \
+	 ../../i18n/en/libqjumpx.ts \
+	 ../../i18n/es/libqjumpx.ts \
+	 ../../i18n/fr/libqjumpx.ts \
+	 ../../i18n/hu/libqjumpx.ts \
+	 ../../i18n/ja/libqjumpx.ts \
+	 ../../i18n/ko/libqjumpx.ts \
+	 ../../i18n/no/libqjumpx.ts \
+	 ../../i18n/pl/libqjumpx.ts \
+	 ../../i18n/pt/libqjumpx.ts \
+	 ../../i18n/pt_BR/libqjumpx.ts \
+	 ../../i18n/sl/libqjumpx.ts \
+	 ../../i18n/zh_CN/libqjumpx.ts \
+	 ../../i18n/zh_TW/libqjumpx.ts
diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro
index fbdf5ed..105316f 100644
--- a/inputmethods/keyboard/keyboard.pro
+++ b/inputmethods/keyboard/keyboard.pro
@@ -1,34 +1,31 @@
 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 += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
 LIBS            += -lqpe
 VERSION		= 1.0.0
 
-
-
-TRANSLATIONS = ../../i18n/de/libqkeyboard.ts
-TRANSLATIONS += ../../i18n/en/libqkeyboard.ts
-TRANSLATIONS += ../../i18n/es/libqkeyboard.ts
-TRANSLATIONS += ../../i18n/fr/libqkeyboard.ts
-TRANSLATIONS += ../../i18n/hu/libqkeyboard.ts
-TRANSLATIONS += ../../i18n/ja/libqkeyboard.ts
-TRANSLATIONS += ../../i18n/ko/libqkeyboard.ts
-TRANSLATIONS += ../../i18n/no/libqkeyboard.ts
-TRANSLATIONS += ../../i18n/pl/libqkeyboard.ts
-TRANSLATIONS += ../../i18n/pt/libqkeyboard.ts
-TRANSLATIONS += ../../i18n/pt_BR/libqkeyboard.ts
-TRANSLATIONS += ../../i18n/sl/libqkeyboard.ts
-TRANSLATIONS += ../../i18n/zh_CN/libqkeyboard.ts
-TRANSLATIONS += ../../i18n/zh_TW/libqkeyboard.ts
-
+TRANSLATIONS = ../../i18n/de/libqkeyboard.ts \
+	 ../../i18n/en/libqkeyboard.ts \
+	 ../../i18n/es/libqkeyboard.ts \
+	 ../../i18n/fr/libqkeyboard.ts \
+	 ../../i18n/hu/libqkeyboard.ts \
+	 ../../i18n/ja/libqkeyboard.ts \
+	 ../../i18n/ko/libqkeyboard.ts \
+	 ../../i18n/no/libqkeyboard.ts \
+	 ../../i18n/pl/libqkeyboard.ts \
+	 ../../i18n/pt/libqkeyboard.ts \
+	 ../../i18n/pt_BR/libqkeyboard.ts \
+	 ../../i18n/sl/libqkeyboard.ts \
+	 ../../i18n/zh_CN/libqkeyboard.ts \
+	 ../../i18n/zh_TW/libqkeyboard.ts
diff --git a/inputmethods/kjumpx/kjumpx.pro b/inputmethods/kjumpx/kjumpx.pro
index d86a0e5..23faa9c 100644
--- a/inputmethods/kjumpx/kjumpx.pro
+++ b/inputmethods/kjumpx/kjumpx.pro
@@ -1,29 +1,27 @@
 TEMPLATE        = lib
 CONFIG         += qt warn_on release
 HEADERS         = keyboard.h \
 	          keyboardimpl.h
 SOURCES         = keyboard.cpp \
                   keyboardimpl.cpp
 TARGET          = qkjumpx
 DESTDIR         = ../../plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS           += -lqpe
 VERSION         = 1.0.0
 
-
-TRANSLATIONS = ../../i18n/de/libqkjumpx.ts
-TRANSLATIONS += ../../i18n/en/libqkjumpx.ts
-TRANSLATIONS += ../../i18n/es/libqkjumpx.ts
-TRANSLATIONS += ../../i18n/fr/libqkjumpx.ts
-TRANSLATIONS += ../../i18n/hu/libqkjumpx.ts
-TRANSLATIONS += ../../i18n/ja/libqkjumpx.ts
-TRANSLATIONS += ../../i18n/ko/libqkjumpx.ts
-TRANSLATIONS += ../../i18n/no/libqkjumpx.ts
-TRANSLATIONS += ../../i18n/pl/libqkjumpx.ts
-TRANSLATIONS += ../../i18n/pt/libqkjumpx.ts
-TRANSLATIONS += ../../i18n/pt_BR/libqkjumpx.ts
-TRANSLATIONS += ../../i18n/sl/libqkjumpx.ts
-TRANSLATIONS += ../../i18n/zh_CN/libqkjumpx.ts
-TRANSLATIONS += ../../i18n/zh_TW/libqkjumpx.ts
-
+TRANSLATIONS = ../../i18n/de/libqkjumpx.ts \
+	 ../../i18n/en/libqkjumpx.ts \
+	 ../../i18n/es/libqkjumpx.ts \
+	 ../../i18n/fr/libqkjumpx.ts \
+	 ../../i18n/hu/libqkjumpx.ts \
+	 ../../i18n/ja/libqkjumpx.ts \
+	 ../../i18n/ko/libqkjumpx.ts \
+	 ../../i18n/no/libqkjumpx.ts \
+	 ../../i18n/pl/libqkjumpx.ts \
+	 ../../i18n/pt/libqkjumpx.ts \
+	 ../../i18n/pt_BR/libqkjumpx.ts \
+	 ../../i18n/sl/libqkjumpx.ts \
+	 ../../i18n/zh_CN/libqkjumpx.ts \
+	 ../../i18n/zh_TW/libqkjumpx.ts
diff --git a/inputmethods/pickboard/pickboard.pro b/inputmethods/pickboard/pickboard.pro
index 6e0ac4d..3ede6b5 100644
--- a/inputmethods/pickboard/pickboard.pro
+++ b/inputmethods/pickboard/pickboard.pro
@@ -1,28 +1,25 @@
 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 += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
 LIBS            += -lqpe
 VERSION		= 1.0.0
 
-
-
-TRANSLATIONS = ../../i18n/de/libqpickboard.ts
-TRANSLATIONS += ../../i18n/en/libqpickboard.ts
-TRANSLATIONS += ../../i18n/es/libqpickboard.ts
-TRANSLATIONS += ../../i18n/fr/libqpickboard.ts
-TRANSLATIONS += ../../i18n/hu/libqpickboard.ts
-TRANSLATIONS += ../../i18n/ja/libqpickboard.ts
-TRANSLATIONS += ../../i18n/ko/libqpickboard.ts
-TRANSLATIONS += ../../i18n/no/libqpickboard.ts
-TRANSLATIONS += ../../i18n/pl/libqpickboard.ts
-TRANSLATIONS += ../../i18n/pt/libqpickboard.ts
-TRANSLATIONS += ../../i18n/pt_BR/libqpickboard.ts
-TRANSLATIONS += ../../i18n/sl/libqpickboard.ts
-TRANSLATIONS += ../../i18n/zh_CN/libqpickboard.ts
-TRANSLATIONS += ../../i18n/zh_TW/libqpickboard.ts
-
+TRANSLATIONS = ../../i18n/de/libqpickboard.ts \
+	 ../../i18n/en/libqpickboard.ts \
+	 ../../i18n/es/libqpickboard.ts \
+	 ../../i18n/fr/libqpickboard.ts \
+	 ../../i18n/hu/libqpickboard.ts \
+	 ../../i18n/ja/libqpickboard.ts \
+	 ../../i18n/ko/libqpickboard.ts \
+	 ../../i18n/no/libqpickboard.ts \
+	 ../../i18n/pl/libqpickboard.ts \
+	 ../../i18n/pt/libqpickboard.ts \
+	 ../../i18n/pt_BR/libqpickboard.ts \
+	 ../../i18n/sl/libqpickboard.ts \
+	 ../../i18n/zh_CN/libqpickboard.ts \
+	 ../../i18n/zh_TW/libqpickboard.ts
diff --git a/inputmethods/unikeyboard/unikeyboard.pro b/inputmethods/unikeyboard/unikeyboard.pro
index 140d377..5427af4 100644
--- a/inputmethods/unikeyboard/unikeyboard.pro
+++ b/inputmethods/unikeyboard/unikeyboard.pro
@@ -1,28 +1,25 @@
 TEMPLATE	= lib
 CONFIG		+= qt warn_on release
 HEADERS	=   unikeyboard.h unikeyboardimpl.h
 SOURCES	=   unikeyboard.cpp unikeyboardimpl.cpp
 TARGET		= qunikeyboard
 DESTDIR		= ../../plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
 LIBS            += -lqpe
 VERSION		= 1.0.0
 
-
-
-TRANSLATIONS = ../../i18n/de/libqunikeyboard.ts
-TRANSLATIONS += ../../i18n/en/libqunikeyboard.ts
-TRANSLATIONS += ../../i18n/es/libqunikeyboard.ts
-TRANSLATIONS += ../../i18n/fr/libqunikeyboard.ts
-TRANSLATIONS += ../../i18n/hu/libqunikeyboard.ts
-TRANSLATIONS += ../../i18n/ja/libqunikeyboard.ts
-TRANSLATIONS += ../../i18n/ko/libqunikeyboard.ts
-TRANSLATIONS += ../../i18n/no/libqunikeyboard.ts
-TRANSLATIONS += ../../i18n/pl/libqunikeyboard.ts
-TRANSLATIONS += ../../i18n/pt/libqunikeyboard.ts
-TRANSLATIONS += ../../i18n/pt_BR/libqunikeyboard.ts
-TRANSLATIONS += ../../i18n/sl/libqunikeyboard.ts
-TRANSLATIONS += ../../i18n/zh_CN/libqunikeyboard.ts
-TRANSLATIONS += ../../i18n/zh_TW/libqunikeyboard.ts
-
+TRANSLATIONS = ../../i18n/de/libqunikeyboard.ts \
+	 ../../i18n/en/libqunikeyboard.ts \
+	 ../../i18n/es/libqunikeyboard.ts \
+	 ../../i18n/fr/libqunikeyboard.ts \
+	 ../../i18n/hu/libqunikeyboard.ts \
+	 ../../i18n/ja/libqunikeyboard.ts \
+	 ../../i18n/ko/libqunikeyboard.ts \
+	 ../../i18n/no/libqunikeyboard.ts \
+	 ../../i18n/pl/libqunikeyboard.ts \
+	 ../../i18n/pt/libqunikeyboard.ts \
+	 ../../i18n/pt_BR/libqunikeyboard.ts \
+	 ../../i18n/sl/libqunikeyboard.ts \
+	 ../../i18n/zh_CN/libqunikeyboard.ts \
+	 ../../i18n/zh_TW/libqunikeyboard.ts