-rw-r--r-- | libopie/libopie.pro | 1 | ||||
-rw-r--r-- | libopie/sharp_compat.cpp | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/libopie/libopie.pro b/libopie/libopie.pro index a80a407..ef82dfd 100644 --- a/libopie/libopie.pro +++ b/libopie/libopie.pro | |||
@@ -1,88 +1,89 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qte warn_on release | 2 | CONFIG += qte warn_on release |
3 | HEADERS = ofontmenu.h \ | 3 | HEADERS = ofontmenu.h \ |
4 | ocolorbutton.h \ | 4 | ocolorbutton.h \ |
5 | ofiledialog.h ofileselector.h tododb.h \ | 5 | ofiledialog.h ofileselector.h tododb.h \ |
6 | ocheckitem.h todoevent.h todoresource.h \ | 6 | ocheckitem.h todoevent.h todoresource.h \ |
7 | todovcalresource.h xmltree.h \ | 7 | todovcalresource.h xmltree.h \ |
8 | colordialog.h colorpopupmenu.h \ | 8 | colordialog.h colorpopupmenu.h \ |
9 | oclickablelabel.h oprocctrl.h \ | 9 | oclickablelabel.h oprocctrl.h \ |
10 | oprocess.h odevice.h \ | 10 | oprocess.h odevice.h \ |
11 | otimepicker.h otabwidget.h \ | 11 | otimepicker.h otabwidget.h \ |
12 | otabbar.h otabinfo.h \ | 12 | otabbar.h otabinfo.h \ |
13 | ofontselector.h \ | 13 | ofontselector.h \ |
14 | pim/opimrecord.h \ | 14 | pim/opimrecord.h \ |
15 | pim/otodo.h \ | 15 | pim/otodo.h \ |
16 | pim/orecordlist.h \ | 16 | pim/orecordlist.h \ |
17 | pim/opimaccesstemplate.h \ | 17 | pim/opimaccesstemplate.h \ |
18 | pim/opimaccessbackend.h \ | 18 | pim/opimaccessbackend.h \ |
19 | pim/otodoaccess.h \ | 19 | pim/otodoaccess.h \ |
20 | pim/otodoaccessbackend.h \ | 20 | pim/otodoaccessbackend.h \ |
21 | pim/ocontact.h \ | 21 | pim/ocontact.h \ |
22 | pim/ocontactaccess.h \ | 22 | pim/ocontactaccess.h \ |
23 | pim/ocontactaccessbackend.h \ | 23 | pim/ocontactaccessbackend.h \ |
24 | pim/ocontactaccessbackend_xml.h \ | 24 | pim/ocontactaccessbackend_xml.h \ |
25 | pim/ocontactaccessbackend_vcard.h \ | 25 | pim/ocontactaccessbackend_vcard.h \ |
26 | pim/obackendfactory.h \ | 26 | pim/obackendfactory.h \ |
27 | pim/opimcache.h \ | 27 | pim/opimcache.h \ |
28 | pim/otodoaccessvcal.h \ | 28 | pim/otodoaccessvcal.h \ |
29 | pim/orecur.h \ | 29 | pim/orecur.h \ |
30 | pim/opimstate.h \ | 30 | pim/opimstate.h \ |
31 | pim/opimxrefpartner.h \ | 31 | pim/opimxrefpartner.h \ |
32 | pim/opimxref.h \ | 32 | pim/opimxref.h \ |
33 | pim/opimxrefmanager.h \ | 33 | pim/opimxrefmanager.h \ |
34 | pim/opimmaintainer.h \ | 34 | pim/opimmaintainer.h \ |
35 | orecurrancewidget.h \ | 35 | orecurrancewidget.h \ |
36 | oticker.h | 36 | oticker.h |
37 | # pim/otodoaccesssql.h \ | 37 | # pim/otodoaccesssql.h \ |
38 | 38 | ||
39 | SOURCES = ofontmenu.cc \ | 39 | SOURCES = ofontmenu.cc \ |
40 | ocolorbutton.cpp \ | 40 | ocolorbutton.cpp \ |
41 | sharp_compat.cpp \ | ||
41 | xmltree.cc \ | 42 | xmltree.cc \ |
42 | ofiledialog.cc ofileselector.cc \ | 43 | ofiledialog.cc ofileselector.cc \ |
43 | ocheckitem.cpp tododb.cpp todoevent.cpp \ | 44 | ocheckitem.cpp tododb.cpp todoevent.cpp \ |
44 | todovcalresource.cpp colordialog.cpp \ | 45 | todovcalresource.cpp colordialog.cpp \ |
45 | colorpopupmenu.cpp oclickablelabel.cpp \ | 46 | colorpopupmenu.cpp oclickablelabel.cpp \ |
46 | oprocctrl.cpp oprocess.cpp \ | 47 | oprocctrl.cpp oprocess.cpp \ |
47 | odevice.cpp otimepicker.cpp \ | 48 | odevice.cpp otimepicker.cpp \ |
48 | otabwidget.cpp otabbar.cpp \ | 49 | otabwidget.cpp otabbar.cpp \ |
49 | ofontselector.cpp \ | 50 | ofontselector.cpp \ |
50 | pim/otodo.cpp \ | 51 | pim/otodo.cpp \ |
51 | pim/opimrecord.cpp \ | 52 | pim/opimrecord.cpp \ |
52 | pim/otodoaccess.cpp \ | 53 | pim/otodoaccess.cpp \ |
53 | pim/otodoaccessbackend.cpp \ | 54 | pim/otodoaccessbackend.cpp \ |
54 | pim/otodoaccessxml.cpp \ | 55 | pim/otodoaccessxml.cpp \ |
55 | pim/ocontact.cpp \ | 56 | pim/ocontact.cpp \ |
56 | pim/ocontactaccess.cpp \ | 57 | pim/ocontactaccess.cpp \ |
57 | pim/ocontactaccessbackend_vcard.cpp \ | 58 | pim/ocontactaccessbackend_vcard.cpp \ |
58 | pim/otodoaccessvcal.cpp \ | 59 | pim/otodoaccessvcal.cpp \ |
59 | pim/orecur.cpp \ | 60 | pim/orecur.cpp \ |
60 | pim/opimstate.cpp \ | 61 | pim/opimstate.cpp \ |
61 | pim/opimxrefpartner.cpp \ | 62 | pim/opimxrefpartner.cpp \ |
62 | pim/opimxref.cpp \ | 63 | pim/opimxref.cpp \ |
63 | pim/opimxrefmanager.cpp \ | 64 | pim/opimxrefmanager.cpp \ |
64 | pim/opimmaintainer.cpp \ | 65 | pim/opimmaintainer.cpp \ |
65 | orecurrancewidget.cpp \ | 66 | orecurrancewidget.cpp \ |
66 | oticker.cpp | 67 | oticker.cpp |
67 | # pim/otodoaccesssql.cpp \ | 68 | # pim/otodoaccesssql.cpp \ |
68 | 69 | ||
69 | TARGET = opie | 70 | TARGET = opie |
70 | INCLUDEPATH += $(OPIEDIR)/include | 71 | INCLUDEPATH += $(OPIEDIR)/include |
71 | DESTDIR = $(QTDIR)/lib$(PROJMAK) | 72 | DESTDIR = $(QTDIR)/lib$(PROJMAK) |
72 | #VERSION = 1.0.0 | 73 | #VERSION = 1.0.0 |
73 | 74 | ||
74 | # LIBS += -lopiesql | 75 | # LIBS += -lopiesql |
75 | 76 | ||
76 | INTERFACES = otimepickerbase.ui orecurrancebase.ui | 77 | INTERFACES = otimepickerbase.ui orecurrancebase.ui |
77 | 78 | ||
78 | TRANSLATIONS = ../i18n/de/libopie.ts \ | 79 | TRANSLATIONS = ../i18n/de/libopie.ts \ |
79 | ../i18n/en/libopie.ts \ | 80 | ../i18n/en/libopie.ts \ |
80 | ../i18n/es/libopie.ts \ | 81 | ../i18n/es/libopie.ts \ |
81 | ../i18n/fr/libopie.ts \ | 82 | ../i18n/fr/libopie.ts \ |
82 | ../i18n/hu/libopie.ts \ | 83 | ../i18n/hu/libopie.ts \ |
83 | ../i18n/ja/libopie.ts \ | 84 | ../i18n/ja/libopie.ts \ |
84 | ../i18n/ko/libopie.ts \ | 85 | ../i18n/ko/libopie.ts \ |
85 | ../i18n/no/libopie.ts \ | 86 | ../i18n/no/libopie.ts \ |
86 | ../i18n/pl/libopie.ts \ | 87 | ../i18n/pl/libopie.ts \ |
87 | ../i18n/pt/libopie.ts \ | 88 | ../i18n/pt/libopie.ts \ |
88 | ../i18n/pt_BR/libopie.ts \ | 89 | ../i18n/pt_BR/libopie.ts \ |
diff --git a/libopie/sharp_compat.cpp b/libopie/sharp_compat.cpp new file mode 100644 index 0000000..1d16a09 --- a/dev/null +++ b/libopie/sharp_compat.cpp | |||
@@ -0,0 +1,18 @@ | |||
1 | /* | ||
2 | * This file contains hacks or workarounds, that make it possible to use a normal | ||
3 | * libopie arm build (iPAQ or OZ) directly on the Sharp retail ROM. | ||
4 | * This way, we only need one 'official' libopie binary for all platforms. | ||
5 | */ | ||
6 | |||
7 | |||
8 | // 1) Opie's libqpe.so has an additional function in Sound, which is utilized | ||
9 | // in ODevice: | ||
10 | |||
11 | // ok this is really evil ;), but Sound::isFinished is only needed in the | ||
12 | // iPAQ part of ODevice, which is never called on Z's | ||
13 | // we add a "weak" symbol here. This will be used, if ld.so does not find | ||
14 | // a normal ("hard") symbol of the same name - hence only on the retail Z | ||
15 | |||
16 | struct Sound { bool Sound::isFinished ( ) const __attribute__(( weak )); }; | ||
17 | bool Sound::isFinished ( ) const { return true; } | ||
18 | |||