Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

1 files changed, 6 insertions, 3 deletions

diff --git a/library/library.pro b/library/library.pro
index 1837b4f..af505dd 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -1,138 +1,141 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on release
         HEADERS=   calendar.h \
             global.h \
             resource.h \
             xmlreader.h \
             mimetype.h \
             menubutton.h \
             network.h \
             networkinterface.h \
             filemanager.h \
             fontmanager.h \
             qdawg.h \
             datebookmonth.h \
             fileselector.h \
             fileselector_p.h \
             imageedit.h \
             qcopenvelope_qws.h \
             qpedecoration_qws.h \
             qpeapplication.h \
             qpestyle.h \
             qpedialog.h \
             lightstyle.h \
             config.h \
             applnk.h \
             sound.h \
             tzselect.h \
             qmath.h \
             datebookdb.h \
             alarmserver.h \
             process.h \
             password.h \
             timestring.h \
             fontfactoryinterface.h \
             fontdatabase.h \
             power.h \
             storage.h \
             qpemessagebox.h \
-        backend/timeconversion.h \
+            timeconversion.h \
             qpedebug.h \
             qpemenubar.h \
             qpetoolbar.h \
             backend/categories.h \
-            backend/stringutil.h \
+            stringutil.h \
             backend/palmtoprecord.h \
             backend/task.h \
             backend/event.h \
             backend/contact.h\
             categorymenu.h \
             categoryedit_p.h \
             categoryselect.h \
             categorywidget.h \
         ir.h \
         backend/vobject_p.h \
         findwidget_p.h \
         finddialog.h \
-        lnkproperties.h
+        lnkproperties.h \
+        windowdecorationinterface.h \
+        textcodecinterface.h \
+        imagecodecinterface.h
         SOURCES=   calendar.cpp \
             global.cpp \
             xmlreader.cpp \
             mimetype.cpp \
             menubutton.cpp \
             network.cpp \
             networkinterface.cpp \
             filemanager.cpp \
             fontmanager.cpp \
             qdawg.cpp \
             datebookmonth.cpp \
             fileselector.cpp \
             imageedit.cpp \
             resource.cpp \
             qpedecoration_qws.cpp \
             qcopenvelope_qws.cpp \
             qpeapplication.cpp \
             qpestyle.cpp \
             qpedialog.cpp \
             lightstyle.cpp \
             config.cpp \
             applnk.cpp \
             sound.cpp \
             tzselect.cpp \
             qmath.c \
             datebookdb.cpp \
             alarmserver.cpp \
             password.cpp \
             process.cpp \
             process_unix.cpp \
             timestring.cpp \
             fontdatabase.cpp \
             power.cpp \
             storage.cpp \
             qpemessagebox.cpp \
             backend/timeconversion.cpp \
             qpedebug.cpp \
             qpemenubar.cpp \
             qpetoolbar.cpp \
             backend/categories.cpp \
             backend/stringutil.cpp \
             backend/palmtoprecord.cpp \
             backend/task.cpp \
             backend/event.cpp \
             backend/contact.cpp \
             categorymenu.cpp \
         categoryedit_p.cpp \
         categoryselect.cpp \
         categorywidget.cpp \
         ir.cpp \
         backend/vcc_yacc.cpp \
         backend/vobject.cpp \
         findwidget_p.cpp \
         finddialog.cpp \
         lnkproperties.cpp
 # Qt 3 compatibility
 qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
 qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
 INCLUDEPATH += $(OPIEDIR)/include backend
         LIBS    += -ldl -lcrypt -lm
 INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
         TARGET  = qpe
         DESTDIR         = $(QTDIR)/lib$(PROJMAK)
 # This is set by configure$(OPIEDIR).
         VERSION         = 1.5.0.1
 
 TRANSLATIONS = ../i18n/de/libqpe.ts \
          ../i18n/en/libqpe.ts \
          ../i18n/es/libqpe.ts \
          ../i18n/fr/libqpe.ts \
          ../i18n/hu/libqpe.ts \
          ../i18n/ja/libqpe.ts \
          ../i18n/ko/libqpe.ts \
          ../i18n/no/libqpe.ts \
          ../i18n/pl/libqpe.ts \
          ../i18n/pt/libqpe.ts \
          ../i18n/pt_BR/libqpe.ts \
          ../i18n/sl/libqpe.ts \
          ../i18n/zh_CN/libqpe.ts \
          ../i18n/it/libqpe.ts \
          ../i18n/zh_TW/libqpe.ts