summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make2
-rw-r--r--library/library.pro6
2 files changed, 4 insertions, 4 deletions
diff --git a/Rules.make b/Rules.make
index 04cfbee..e8b2420 100644
--- a/Rules.make
+++ b/Rules.make
@@ -33,49 +33,49 @@ else
33 echo CONFIG += qt3 >> $@ 33 echo CONFIG += qt3 >> $@
34endif 34endif
35ifneq ($(CONFIG_QUICK_LAUNCH),) 35ifneq ($(CONFIG_QUICK_LAUNCH),)
36 echo contains\( CONFIG, quick-app \) \{ >> $@ 36 echo contains\( CONFIG, quick-app \) \{ >> $@
37 echo CONFIG -= staticlib >> $@ 37 echo CONFIG -= staticlib >> $@
38 echo CONFIG -= quick-app >> $@ 38 echo CONFIG -= quick-app >> $@
39 echo CONFIG += quick-app-lib >> $@ 39 echo CONFIG += quick-app-lib >> $@
40 echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@ 40 echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@
41 echo \} >> $@ 41 echo \} >> $@
42else 42else
43 echo contains\( CONFIG, quick-app \) \{ >> $@ 43 echo contains\( CONFIG, quick-app \) \{ >> $@
44 echo CONFIG -= quick-app >> $@ 44 echo CONFIG -= quick-app >> $@
45 echo CONFIG += quick-app-bin >> $@ 45 echo CONFIG += quick-app-bin >> $@
46 echo \} >> $@ 46 echo \} >> $@
47endif 47endif
48ifeq ($(CONFIG_SQL_PIM_BACKEND),y) 48ifeq ($(CONFIG_SQL_PIM_BACKEND),y)
49 echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@ 49 echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@
50else 50else
51 echo ENABLE_SQL_PIM_BACKEND=n >> $@ 51 echo ENABLE_SQL_PIM_BACKEND=n >> $@
52endif 52endif
53ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) 53ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
54 echo CONFIG += no-override >> $@ 54 echo CONFIG += no-override >> $@
55endif 55endif
56ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y) 56ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y)
57 echo DEFINES += OPIE_WITHROHFEEDBACK >> $@ 57 echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@
58endif 58endif
59ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) 59ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y)
60 echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@ 60 echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@
61endif 61endif
62ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) 62ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
63 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ 63 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
64endif 64endif
65ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) 65ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y)
66 echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ 66 echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@
67endif 67endif
68ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) 68ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y)
69 echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ 69 echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@
70endif 70endif
71ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y) 71ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y)
72 echo DEFINES += USE_FILE_NOTIFICATION >> $@ 72 echo DEFINES += USE_FILE_NOTIFICATION >> $@
73endif 73endif
74ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) 74ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y)
75 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ 75 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@
76endif 76endif
77ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) 77ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
78 echo DEFINES += OPIE_NEW_MALLOC >> $@ 78 echo DEFINES += OPIE_NEW_MALLOC >> $@
79endif 79endif
80ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) 80ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y)
81 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ 81 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@
diff --git a/library/library.pro b/library/library.pro
index af07fa3..1f68b74 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -26,49 +26,48 @@ HEADERS = calendar.h \
26 applnk.h \ 26 applnk.h \
27 sound.h \ 27 sound.h \
28 tzselect.h \ 28 tzselect.h \
29 qmath.h \ 29 qmath.h \
30 datebookdb.h \ 30 datebookdb.h \
31 alarmserver.h \ 31 alarmserver.h \
32 process.h \ 32 process.h \
33 password.h \ 33 password.h \
34 timestring.h \ 34 timestring.h \
35 fontfactoryinterface.h \ 35 fontfactoryinterface.h \
36 fontdatabase.h \ 36 fontdatabase.h \
37 power.h \ 37 power.h \
38 storage.h \ 38 storage.h \
39 qpemessagebox.h \ 39 qpemessagebox.h \
40 timeconversion.h \ 40 timeconversion.h \
41 qpedebug.h \ 41 qpedebug.h \
42 qpemenubar.h \ 42 qpemenubar.h \
43 qpetoolbar.h \ 43 qpetoolbar.h \
44 backend/categories.h \ 44 backend/categories.h \
45 stringutil.h \ 45 stringutil.h \
46 backend/palmtoprecord.h \ 46 backend/palmtoprecord.h \
47 backend/task.h \ 47 backend/task.h \
48 backend/event.h \ 48 backend/event.h \
49 backend/contact.h\ 49 backend/contact.h\
50 backend/rohfeedback.h \
51 categorymenu.h \ 50 categorymenu.h \
52 categoryedit_p.h \ 51 categoryedit_p.h \
53 categoryselect.h \ 52 categoryselect.h \
54 categorywidget.h \ 53 categorywidget.h \
55 ir.h \ 54 ir.h \
56 backend/vobject_p.h \ 55 backend/vobject_p.h \
57 findwidget_p.h \ 56 findwidget_p.h \
58 finddialog.h \ 57 finddialog.h \
59 lnkproperties.h \ 58 lnkproperties.h \
60 windowdecorationinterface.h \ 59 windowdecorationinterface.h \
61 textcodecinterface.h \ 60 textcodecinterface.h \
62 imagecodecinterface.h \ 61 imagecodecinterface.h \
63 qt_override_p.h 62 qt_override_p.h
64 63
65 SOURCES= calendar.cpp \ 64 SOURCES= calendar.cpp \
66 global.cpp \ 65 global.cpp \
67 xmlreader.cpp \ 66 xmlreader.cpp \
68 mimetype.cpp \ 67 mimetype.cpp \
69 menubutton.cpp \ 68 menubutton.cpp \
70 network.cpp \ 69 network.cpp \
71 networkinterface.cpp \ 70 networkinterface.cpp \
72 filemanager.cpp \ 71 filemanager.cpp \
73 fontmanager.cpp \ 72 fontmanager.cpp \
74 qdawg.cpp \ 73 qdawg.cpp \
@@ -86,58 +85,59 @@ SOURCES = calendar.cpp \
86 applnk.cpp \ 85 applnk.cpp \
87 sound.cpp \ 86 sound.cpp \
88 tzselect.cpp \ 87 tzselect.cpp \
89 qmath.c \ 88 qmath.c \
90 datebookdb.cpp \ 89 datebookdb.cpp \
91 alarmserver.cpp \ 90 alarmserver.cpp \
92 password.cpp \ 91 password.cpp \
93 process.cpp \ 92 process.cpp \
94 process_unix.cpp \ 93 process_unix.cpp \
95 timestring.cpp \ 94 timestring.cpp \
96 fontdatabase.cpp \ 95 fontdatabase.cpp \
97 power.cpp \ 96 power.cpp \
98 storage.cpp \ 97 storage.cpp \
99 qpemessagebox.cpp \ 98 qpemessagebox.cpp \
100 backend/timeconversion.cpp \ 99 backend/timeconversion.cpp \
101 qpedebug.cpp \ 100 qpedebug.cpp \
102 qpemenubar.cpp \ 101 qpemenubar.cpp \
103 qpetoolbar.cpp \ 102 qpetoolbar.cpp \
104 backend/categories.cpp \ 103 backend/categories.cpp \
105 backend/stringutil.cpp \ 104 backend/stringutil.cpp \
106 backend/palmtoprecord.cpp \ 105 backend/palmtoprecord.cpp \
107 backend/task.cpp \ 106 backend/task.cpp \
108 backend/event.cpp \ 107 backend/event.cpp \
109 backend/contact.cpp \ 108 backend/contact.cpp \
110 backend/rohfeedback.cpp \
111 categorymenu.cpp \ 109 categorymenu.cpp \
112 categoryedit_p.cpp \ 110 categoryedit_p.cpp \
113 categoryselect.cpp \ 111 categoryselect.cpp \
114 categorywidget.cpp \ 112 categorywidget.cpp \
115 ir.cpp \ 113 ir.cpp \
116 backend/vcc_yacc.cpp \ 114 backend/vcc_yacc.cpp \
117 backend/vobject.cpp \ 115 backend/vobject.cpp \
118 findwidget_p.cpp \ 116 findwidget_p.cpp \
119 finddialog.cpp \ 117 finddialog.cpp \
120 lnkproperties.cpp \ 118 lnkproperties.cpp \
121 qt_override.cpp 119 qt_override.cpp
122 120
123 121
124 122
125# Qt 3 compatibility 123# Qt 3 compatibility
126HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h 124HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
127SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp 125SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
128INCLUDEPATH += $(OPIEDIR)/include backend 126INCLUDEPATH += $(OPIEDIR)/include backend
129 LIBS += -ldl -lcrypt -lm 127 LIBS += -ldl -lcrypt -lm
130INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui 128INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
131 TARGET = qpe 129 TARGET = qpe
132 DESTDIR = $(OPIEDIR)/lib$(PROJMAK) 130 DESTDIR = $(OPIEDIR)/lib$(PROJMAK)
133 VERSION = 1.5.0.1 131 VERSION = 1.5.0.1
134 132
135include ( $(OPIEDIR)/include.pro ) 133include ( $(OPIEDIR)/include.pro )
136 134
137contains( CONFIG, no-override ){ 135contains( CONFIG, no-override ){
138 DEFINES += OPIE_NO_OVERRIDE_QT 136 DEFINES += OPIE_NO_OVERRIDE_QT
139} 137}
140 138
141contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){ 139contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){
142 DEFINES += WITHROHFEEDBACK 140 DEFINES += OPIE_ROHFEEDBACK
141 SOURCES += backend/rohfeedback.cpp
142 HEADERS += backend/rohfeedback.h
143} 143}