-rw-r--r-- | library/Makefile.in | 125 | ||||
-rw-r--r-- | library/global.cpp | 2 | ||||
-rw-r--r-- | library/library.pro | 10 |
3 files changed, 25 insertions, 112 deletions
diff --git a/library/Makefile.in b/library/Makefile.in index b74b818..b8fc1f6 100644 --- a/library/Makefile.in +++ b/library/Makefile.in | |||
@@ -26,22 +26,22 @@ TARGET1 = lib$(TARGET).so.$(VER_MAJ) | |||
26 | HEADERS =calendar.h \ | 26 | HEADERS =calendar.h \ |
27 | global.h \ | 27 | global.h \ |
28 | resource.h \ | 28 | resource.h \ |
29 | xmlreader.h \ | 29 | xmlreader.h \ |
30 | mimetype.h \ | 30 | mimetype.h \ |
31 | menubutton.h \ | 31 | menubutton.h \ |
32 | network.h \ | 32 | network.h \ |
33 | networkinterface.h \ | 33 | networkinterface.h \ |
34 | proxies.h \ | ||
35 | filemanager.h \ | 34 | filemanager.h \ |
36 | fontmanager.h \ | 35 | fontmanager.h \ |
37 | qdawg.h \ | 36 | qdawg.h \ |
38 | datebookmonth.h \ | 37 | datebookmonth.h \ |
39 | fileselector.h \ | 38 | fileselector.h \ |
39 | fileselector_p.h \ | ||
40 | imageedit.h \ | 40 | imageedit.h \ |
41 | qcopenvelope_qws.h \ | 41 | qcopenvelope_qws.h \ |
42 | qpedecoration_qws.h \ | 42 | qpedecoration_qws.h \ |
43 | qpeapplication.h \ | 43 | qpeapplication.h \ |
44 | qpestyle.h \ | 44 | qpestyle.h \ |
45 | qpedialog.h \ | 45 | qpedialog.h \ |
46 | lightstyle.h \ | 46 | lightstyle.h \ |
47 | config.h \ | 47 | config.h \ |
@@ -73,30 +73,24 @@ HEADERS = calendar.h \ | |||
73 | categorymenu.h \ | 73 | categorymenu.h \ |
74 | categoryedit_p.h \ | 74 | categoryedit_p.h \ |
75 | categoryselect.h \ | 75 | categoryselect.h \ |
76 | categorywidget.h \ | 76 | categorywidget.h \ |
77 | ir.h \ | 77 | ir.h \ |
78 | backend/vobject_p.h \ | 78 | backend/vobject_p.h \ |
79 | findwidget_p.h \ | 79 | findwidget_p.h \ |
80 | finddialog.h \ | 80 | finddialog.h \ |
81 | lnkproperties.h \ | 81 | lnkproperties.h |
82 | quuid.h \ | ||
83 | qcom.h \ | ||
84 | qlibrary.h \ | ||
85 | qlibrary_p.h \ | ||
86 | qprocess.h | ||
87 | SOURCES =calendar.cpp \ | 82 | SOURCES =calendar.cpp \ |
88 | global.cpp \ | 83 | global.cpp \ |
89 | xmlreader.cpp \ | 84 | xmlreader.cpp \ |
90 | mimetype.cpp \ | 85 | mimetype.cpp \ |
91 | menubutton.cpp \ | 86 | menubutton.cpp \ |
92 | network.cpp \ | 87 | network.cpp \ |
93 | networkinterface.cpp \ | 88 | networkinterface.cpp \ |
94 | proxies.cpp \ | ||
95 | filemanager.cpp \ | 89 | filemanager.cpp \ |
96 | fontmanager.cpp \ | 90 | fontmanager.cpp \ |
97 | qdawg.cpp \ | 91 | qdawg.cpp \ |
98 | datebookmonth.cpp \ | 92 | datebookmonth.cpp \ |
99 | fileselector.cpp \ | 93 | fileselector.cpp \ |
100 | imageedit.cpp \ | 94 | imageedit.cpp \ |
101 | resource.cpp \ | 95 | resource.cpp \ |
102 | qpedecoration_qws.cpp \ | 96 | qpedecoration_qws.cpp \ |
@@ -134,30 +128,24 @@ SOURCES = calendar.cpp \ | |||
134 | categoryedit_p.cpp \ | 128 | categoryedit_p.cpp \ |
135 | categoryselect.cpp \ | 129 | categoryselect.cpp \ |
136 | categorywidget.cpp \ | 130 | categorywidget.cpp \ |
137 | ir.cpp \ | 131 | ir.cpp \ |
138 | backend/vcc_yacc.cpp \ | 132 | backend/vcc_yacc.cpp \ |
139 | backend/vobject.cpp \ | 133 | backend/vobject.cpp \ |
140 | findwidget_p.cpp \ | 134 | findwidget_p.cpp \ |
141 | finddialog.cpp \ | 135 | finddialog.cpp \ |
142 | lnkproperties.cpp \ | 136 | lnkproperties.cpp |
143 | quuid.cpp \ | ||
144 | qlibrary.cpp \ | ||
145 | qlibrary_unix.cpp \ | ||
146 | qprocess.cpp \ | ||
147 | qprocess_unix.cpp | ||
148 | OBJECTS =calendar.o \ | 137 | OBJECTS =calendar.o \ |
149 | global.o \ | 138 | global.o \ |
150 | xmlreader.o \ | 139 | xmlreader.o \ |
151 | mimetype.o \ | 140 | mimetype.o \ |
152 | menubutton.o \ | 141 | menubutton.o \ |
153 | network.o \ | 142 | network.o \ |
154 | networkinterface.o \ | 143 | networkinterface.o \ |
155 | proxies.o \ | ||
156 | filemanager.o \ | 144 | filemanager.o \ |
157 | fontmanager.o \ | 145 | fontmanager.o \ |
158 | qdawg.o \ | 146 | qdawg.o \ |
159 | datebookmonth.o \ | 147 | datebookmonth.o \ |
160 | fileselector.o \ | 148 | fileselector.o \ |
161 | imageedit.o \ | 149 | imageedit.o \ |
162 | resource.o \ | 150 | resource.o \ |
163 | qpedecoration_qws.o \ | 151 | qpedecoration_qws.o \ |
@@ -196,45 +184,36 @@ OBJECTS = calendar.o \ | |||
196 | categoryselect.o \ | 184 | categoryselect.o \ |
197 | categorywidget.o \ | 185 | categorywidget.o \ |
198 | ir.o \ | 186 | ir.o \ |
199 | backend/vcc_yacc.o \ | 187 | backend/vcc_yacc.o \ |
200 | backend/vobject.o \ | 188 | backend/vobject.o \ |
201 | findwidget_p.o \ | 189 | findwidget_p.o \ |
202 | finddialog.o \ | 190 | finddialog.o \ |
203 | lnkproperties.o \ | 191 | lnkproperties.o \ |
204 | quuid.o \ | ||
205 | qlibrary.o \ | ||
206 | qlibrary_unix.o \ | ||
207 | qprocess.o \ | ||
208 | qprocess_unix.o \ | ||
209 | passwordbase_p.o \ | 192 | passwordbase_p.o \ |
210 | proxiesbase_p.o \ | ||
211 | categoryeditbase_p.o \ | 193 | categoryeditbase_p.o \ |
212 | findwidgetbase_p.o \ | 194 | findwidgetbase_p.o \ |
213 | lnkpropertiesbase_p.o | 195 | lnkpropertiesbase_p.o |
214 | INTERFACES = passwordbase_p.ui \ | 196 | INTERFACES = passwordbase_p.ui \ |
215 | proxiesbase_p.ui \ | ||
216 | categoryeditbase_p.ui \ | 197 | categoryeditbase_p.ui \ |
217 | findwidgetbase_p.ui \ | 198 | findwidgetbase_p.ui \ |
218 | lnkpropertiesbase_p.ui | 199 | lnkpropertiesbase_p.ui |
219 | UICDECLS = passwordbase_p.h \ | 200 | UICDECLS = passwordbase_p.h \ |
220 | proxiesbase_p.h \ | ||
221 | categoryeditbase_p.h \ | 201 | categoryeditbase_p.h \ |
222 | findwidgetbase_p.h \ | 202 | findwidgetbase_p.h \ |
223 | lnkpropertiesbase_p.h | 203 | lnkpropertiesbase_p.h |
224 | UICIMPLS = passwordbase_p.cpp \ | 204 | UICIMPLS = passwordbase_p.cpp \ |
225 | proxiesbase_p.cpp \ | ||
226 | categoryeditbase_p.cpp \ | 205 | categoryeditbase_p.cpp \ |
227 | findwidgetbase_p.cpp \ | 206 | findwidgetbase_p.cpp \ |
228 | lnkpropertiesbase_p.cpp | 207 | lnkpropertiesbase_p.cpp |
229 | SRCMOC =moc_menubutton.cpp \ | 208 | SRCMOC =moc_menubutton.cpp \ |
230 | moc_proxies.cpp \ | ||
231 | moc_datebookmonth.cpp \ | 209 | moc_datebookmonth.cpp \ |
232 | moc_fileselector.cpp \ | 210 | moc_fileselector.cpp \ |
211 | moc_fileselector_p.cpp \ | ||
233 | moc_imageedit.cpp \ | 212 | moc_imageedit.cpp \ |
234 | moc_qpedecoration_qws.cpp \ | 213 | moc_qpedecoration_qws.cpp \ |
235 | moc_qpeapplication.cpp \ | 214 | moc_qpeapplication.cpp \ |
236 | moc_qpedialog.cpp \ | 215 | moc_qpedialog.cpp \ |
237 | moc_tzselect.cpp \ | 216 | moc_tzselect.cpp \ |
238 | moc_process.cpp \ | 217 | moc_process.cpp \ |
239 | moc_storage.cpp \ | 218 | moc_storage.cpp \ |
240 | moc_qpemenubar.cpp \ | 219 | moc_qpemenubar.cpp \ |
@@ -242,33 +221,29 @@ SRCMOC = moc_menubutton.cpp \ | |||
242 | backend/moc_categories.cpp \ | 221 | backend/moc_categories.cpp \ |
243 | moc_categorymenu.cpp \ | 222 | moc_categorymenu.cpp \ |
244 | moc_categoryedit_p.cpp \ | 223 | moc_categoryedit_p.cpp \ |
245 | moc_categoryselect.cpp \ | 224 | moc_categoryselect.cpp \ |
246 | moc_ir.cpp \ | 225 | moc_ir.cpp \ |
247 | moc_findwidget_p.cpp \ | 226 | moc_findwidget_p.cpp \ |
248 | moc_finddialog.cpp \ | 227 | moc_finddialog.cpp \ |
249 | moc_lnkproperties.cpp \ | 228 | moc_lnkproperties.cpp \ |
250 | moc_qlibrary_p.cpp \ | ||
251 | moc_qprocess.cpp \ | ||
252 | global.moc \ | 229 | global.moc \ |
253 | network.moc \ | 230 | network.moc \ |
254 | password.moc \ | 231 | password.moc \ |
255 | process_unix.moc \ | 232 | process_unix.moc \ |
256 | timestring.moc \ | 233 | timestring.moc \ |
257 | qprocess_unix.moc \ | ||
258 | moc_passwordbase_p.cpp \ | 234 | moc_passwordbase_p.cpp \ |
259 | moc_proxiesbase_p.cpp \ | ||
260 | moc_categoryeditbase_p.cpp \ | 235 | moc_categoryeditbase_p.cpp \ |
261 | moc_findwidgetbase_p.cpp \ | 236 | moc_findwidgetbase_p.cpp \ |
262 | moc_lnkpropertiesbase_p.cpp | 237 | moc_lnkpropertiesbase_p.cpp |
263 | OBJMOC =moc_menubutton.o \ | 238 | OBJMOC =moc_menubutton.o \ |
264 | moc_proxies.o \ | ||
265 | moc_datebookmonth.o \ | 239 | moc_datebookmonth.o \ |
266 | moc_fileselector.o \ | 240 | moc_fileselector.o \ |
241 | moc_fileselector_p.o \ | ||
267 | moc_imageedit.o \ | 242 | moc_imageedit.o \ |
268 | moc_qpedecoration_qws.o \ | 243 | moc_qpedecoration_qws.o \ |
269 | moc_qpeapplication.o \ | 244 | moc_qpeapplication.o \ |
270 | moc_qpedialog.o \ | 245 | moc_qpedialog.o \ |
271 | moc_tzselect.o \ | 246 | moc_tzselect.o \ |
272 | moc_process.o \ | 247 | moc_process.o \ |
273 | moc_storage.o \ | 248 | moc_storage.o \ |
274 | moc_qpemenubar.o \ | 249 | moc_qpemenubar.o \ |
@@ -276,20 +251,17 @@ OBJMOC = moc_menubutton.o \ | |||
276 | backend/moc_categories.o \ | 251 | backend/moc_categories.o \ |
277 | moc_categorymenu.o \ | 252 | moc_categorymenu.o \ |
278 | moc_categoryedit_p.o \ | 253 | moc_categoryedit_p.o \ |
279 | moc_categoryselect.o \ | 254 | moc_categoryselect.o \ |
280 | moc_ir.o \ | 255 | moc_ir.o \ |
281 | moc_findwidget_p.o \ | 256 | moc_findwidget_p.o \ |
282 | moc_finddialog.o \ | 257 | moc_finddialog.o \ |
283 | moc_lnkproperties.o \ | 258 | moc_lnkproperties.o \ |
284 | moc_qlibrary_p.o \ | ||
285 | moc_qprocess.o \ | ||
286 | moc_passwordbase_p.o \ | 259 | moc_passwordbase_p.o \ |
287 | moc_proxiesbase_p.o \ | ||
288 | moc_categoryeditbase_p.o \ | 260 | moc_categoryeditbase_p.o \ |
289 | moc_findwidgetbase_p.o \ | 261 | moc_findwidgetbase_p.o \ |
290 | moc_lnkpropertiesbase_p.o | 262 | moc_lnkpropertiesbase_p.o |
291 | 263 | ||
292 | 264 | ||
293 | ####### Implicit rules | 265 | ####### Implicit rules |
294 | 266 | ||
295 | .SUFFIXES: .cpp .cxx .cc .C .c | 267 | .SUFFIXES: .cpp .cxx .cc .C .c |
@@ -314,18 +286,20 @@ OBJMOC = moc_menubutton.o \ | |||
314 | 286 | ||
315 | all: $(DESTDIR)$(SYSCONF_LINK_TARGET) | 287 | all: $(DESTDIR)$(SYSCONF_LINK_TARGET) |
316 | 288 | ||
317 | $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | 289 | $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) |
318 | $(SYSCONF_LINK_LIB) | 290 | $(SYSCONF_LINK_LIB) |
319 | 291 | ||
320 | moc: $(SRCMOC) | 292 | moc: $(SRCMOC) |
321 | 293 | ||
322 | tmake: | 294 | tmake: Makefile.in |
323 | tmake library.pro | 295 | |
296 | Makefile.in: library.pro | ||
297 | tmake library.pro -o Makefile.in | ||
324 | 298 | ||
325 | clean: | 299 | clean: |
326 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 300 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
327 | -rm -f *~ core | 301 | -rm -f *~ core |
328 | -rm -f allmoc.cpp | 302 | -rm -f allmoc.cpp |
329 | 303 | ||
330 | ####### Extension Modules | 304 | ####### Extension Modules |
331 | 305 | ||
@@ -376,21 +350,16 @@ menubutton.o: menubutton.cpp \ | |||
376 | network.o: network.cpp \ | 350 | network.o: network.cpp \ |
377 | network.moc | 351 | network.moc |
378 | 352 | ||
379 | networkinterface.o: networkinterface.cpp \ | 353 | networkinterface.o: networkinterface.cpp \ |
380 | networkinterface.h \ | 354 | networkinterface.h \ |
381 | network.h \ | 355 | network.h \ |
382 | config.h | 356 | config.h |
383 | 357 | ||
384 | proxies.o: proxies.cpp \ | ||
385 | proxies.h \ | ||
386 | config.h \ | ||
387 | proxiesbase_p.h | ||
388 | |||
389 | filemanager.o: filemanager.cpp \ | 358 | filemanager.o: filemanager.cpp \ |
390 | filemanager.h \ | 359 | filemanager.h \ |
391 | applnk.h | 360 | applnk.h |
392 | 361 | ||
393 | fontmanager.o: fontmanager.cpp \ | 362 | fontmanager.o: fontmanager.cpp \ |
394 | fontmanager.h | 363 | fontmanager.h |
395 | 364 | ||
396 | qdawg.o: qdawg.cpp \ | 365 | qdawg.o: qdawg.cpp \ |
@@ -405,16 +374,17 @@ datebookmonth.o: datebookmonth.cpp \ | |||
405 | resource.h \ | 374 | resource.h \ |
406 | qpeapplication.h \ | 375 | qpeapplication.h \ |
407 | qpedecoration_qws.h | 376 | qpedecoration_qws.h |
408 | 377 | ||
409 | fileselector.o: fileselector.cpp \ | 378 | fileselector.o: fileselector.cpp \ |
410 | fileselector.h \ | 379 | fileselector.h \ |
411 | filemanager.h \ | 380 | filemanager.h \ |
412 | applnk.h \ | 381 | applnk.h \ |
382 | fileselector_p.h \ | ||
413 | global.h \ | 383 | global.h \ |
414 | resource.h \ | 384 | resource.h \ |
415 | config.h \ | 385 | config.h \ |
416 | storage.h \ | 386 | storage.h \ |
417 | qpemenubar.h \ | 387 | qpemenubar.h \ |
418 | lnkproperties.h \ | 388 | lnkproperties.h \ |
419 | qpeapplication.h \ | 389 | qpeapplication.h \ |
420 | qpedecoration_qws.h \ | 390 | qpedecoration_qws.h \ |
@@ -529,18 +499,17 @@ timestring.o: timestring.cpp \ | |||
529 | fontdatabase.o: fontdatabase.cpp \ | 499 | fontdatabase.o: fontdatabase.cpp \ |
530 | qpeapplication.h \ | 500 | qpeapplication.h \ |
531 | qpedecoration_qws.h \ | 501 | qpedecoration_qws.h \ |
532 | timestring.h \ | 502 | timestring.h \ |
533 | fontfactoryinterface.h \ | 503 | fontfactoryinterface.h \ |
534 | fontdatabase.h | 504 | fontdatabase.h |
535 | 505 | ||
536 | power.o: power.cpp \ | 506 | power.o: power.cpp \ |
537 | power.h \ | 507 | power.h |
538 | custom.h | ||
539 | 508 | ||
540 | storage.o: storage.cpp | 509 | storage.o: storage.cpp |
541 | 510 | ||
542 | qpemessagebox.o: qpemessagebox.cpp \ | 511 | qpemessagebox.o: qpemessagebox.cpp \ |
543 | qpemessagebox.h | 512 | qpemessagebox.h |
544 | 513 | ||
545 | backend/timeconversion.o: backend/timeconversion.cpp \ | 514 | backend/timeconversion.o: backend/timeconversion.cpp \ |
546 | backend/timeconversion.h | 515 | backend/timeconversion.h |
@@ -628,47 +597,22 @@ finddialog.o: finddialog.cpp \ | |||
628 | findwidget_p.h \ | 597 | findwidget_p.h \ |
629 | findwidgetbase_p.h | 598 | findwidgetbase_p.h |
630 | 599 | ||
631 | lnkproperties.o: lnkproperties.cpp \ | 600 | lnkproperties.o: lnkproperties.cpp \ |
632 | lnkproperties.h \ | 601 | lnkproperties.h \ |
633 | lnkpropertiesbase_p.h \ | 602 | lnkpropertiesbase_p.h \ |
634 | ir.h | 603 | ir.h |
635 | 604 | ||
636 | quuid.o: quuid.cpp \ | ||
637 | quuid.h | ||
638 | |||
639 | qlibrary.o: qlibrary.cpp \ | ||
640 | qlibrary_p.h \ | ||
641 | qlibrary.h | ||
642 | |||
643 | qlibrary_unix.o: qlibrary_unix.cpp \ | ||
644 | qlibrary_p.h \ | ||
645 | qlibrary.h | ||
646 | |||
647 | qprocess.o: qprocess.cpp \ | ||
648 | qprocess.h | ||
649 | |||
650 | qprocess_unix.o: qprocess_unix.cpp \ | ||
651 | qprocess_unix.moc \ | ||
652 | qprocess.h \ | ||
653 | qcleanuphandler_p.h | ||
654 | |||
655 | passwordbase_p.h: passwordbase_p.ui | 605 | passwordbase_p.h: passwordbase_p.ui |
656 | $(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h | 606 | $(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h |
657 | 607 | ||
658 | passwordbase_p.cpp: passwordbase_p.ui | 608 | passwordbase_p.cpp: passwordbase_p.ui |
659 | $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp | 609 | $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp |
660 | 610 | ||
661 | proxiesbase_p.h: proxiesbase_p.ui | ||
662 | $(UIC) proxiesbase_p.ui -o $(INTERFACE_DECL_PATH)/proxiesbase_p.h | ||
663 | |||
664 | proxiesbase_p.cpp: proxiesbase_p.ui | ||
665 | $(UIC) proxiesbase_p.ui -i proxiesbase_p.h -o proxiesbase_p.cpp | ||
666 | |||
667 | categoryeditbase_p.h: categoryeditbase_p.ui | 611 | categoryeditbase_p.h: categoryeditbase_p.ui |
668 | $(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h | 612 | $(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h |
669 | 613 | ||
670 | categoryeditbase_p.cpp: categoryeditbase_p.ui | 614 | categoryeditbase_p.cpp: categoryeditbase_p.ui |
671 | $(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp | 615 | $(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp |
672 | 616 | ||
673 | findwidgetbase_p.h: findwidgetbase_p.ui | 617 | findwidgetbase_p.h: findwidgetbase_p.ui |
674 | $(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h | 618 | $(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h |
@@ -679,41 +623,38 @@ findwidgetbase_p.cpp: findwidgetbase_p.ui | |||
679 | lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui | 623 | lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui |
680 | $(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h | 624 | $(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h |
681 | 625 | ||
682 | lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui | 626 | lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui |
683 | $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp | 627 | $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp |
684 | 628 | ||
685 | passwordbase_p.o: passwordbase_p.cpp | 629 | passwordbase_p.o: passwordbase_p.cpp |
686 | 630 | ||
687 | proxiesbase_p.o: proxiesbase_p.cpp | ||
688 | |||
689 | categoryeditbase_p.o: categoryeditbase_p.cpp | 631 | categoryeditbase_p.o: categoryeditbase_p.cpp |
690 | 632 | ||
691 | findwidgetbase_p.o: findwidgetbase_p.cpp | 633 | findwidgetbase_p.o: findwidgetbase_p.cpp |
692 | 634 | ||
693 | lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp | 635 | lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp |
694 | 636 | ||
695 | moc_menubutton.o: moc_menubutton.cpp \ | 637 | moc_menubutton.o: moc_menubutton.cpp \ |
696 | menubutton.h | 638 | menubutton.h |
697 | 639 | ||
698 | moc_proxies.o: moc_proxies.cpp \ | ||
699 | proxies.h \ | ||
700 | config.h | ||
701 | |||
702 | moc_datebookmonth.o: moc_datebookmonth.cpp \ | 640 | moc_datebookmonth.o: moc_datebookmonth.cpp \ |
703 | datebookmonth.h \ | 641 | datebookmonth.h \ |
704 | calendar.h \ | 642 | calendar.h \ |
705 | timestring.h | 643 | timestring.h |
706 | 644 | ||
707 | moc_fileselector.o: moc_fileselector.cpp \ | 645 | moc_fileselector.o: moc_fileselector.cpp \ |
708 | fileselector.h \ | 646 | fileselector.h \ |
709 | filemanager.h \ | 647 | filemanager.h \ |
710 | applnk.h | 648 | applnk.h |
711 | 649 | ||
650 | moc_fileselector_p.o: moc_fileselector_p.cpp \ | ||
651 | fileselector_p.h | ||
652 | |||
712 | moc_imageedit.o: moc_imageedit.cpp \ | 653 | moc_imageedit.o: moc_imageedit.cpp \ |
713 | imageedit.h | 654 | imageedit.h |
714 | 655 | ||
715 | moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \ | 656 | moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \ |
716 | qpedecoration_qws.h | 657 | qpedecoration_qws.h |
717 | 658 | ||
718 | moc_qpeapplication.o: moc_qpeapplication.cpp \ | 659 | moc_qpeapplication.o: moc_qpeapplication.cpp \ |
719 | qpeapplication.h \ | 660 | qpeapplication.h \ |
@@ -761,60 +702,46 @@ moc_findwidget_p.o: moc_findwidget_p.cpp \ | |||
761 | findwidgetbase_p.h | 702 | findwidgetbase_p.h |
762 | 703 | ||
763 | moc_finddialog.o: moc_finddialog.cpp \ | 704 | moc_finddialog.o: moc_finddialog.cpp \ |
764 | finddialog.h | 705 | finddialog.h |
765 | 706 | ||
766 | moc_lnkproperties.o: moc_lnkproperties.cpp \ | 707 | moc_lnkproperties.o: moc_lnkproperties.cpp \ |
767 | lnkproperties.h | 708 | lnkproperties.h |
768 | 709 | ||
769 | moc_qlibrary_p.o: moc_qlibrary_p.cpp \ | ||
770 | qlibrary_p.h \ | ||
771 | qlibrary.h | ||
772 | |||
773 | moc_qprocess.o: moc_qprocess.cpp \ | ||
774 | qprocess.h | ||
775 | |||
776 | moc_passwordbase_p.o: global.moc \ | 710 | moc_passwordbase_p.o: global.moc \ |
777 | global.cpp | 711 | global.cpp |
778 | 712 | ||
779 | moc_proxiesbase_p.o: network.moc \ | 713 | moc_categoryeditbase_p.o: network.moc \ |
780 | network.cpp | 714 | network.cpp |
781 | 715 | ||
782 | moc_categoryeditbase_p.o: password.moc \ | 716 | moc_findwidgetbase_p.o: password.moc \ |
783 | password.cpp \ | 717 | password.cpp \ |
784 | password.h \ | 718 | password.h \ |
785 | config.h \ | 719 | config.h \ |
786 | global.h \ | 720 | global.h \ |
787 | backend/contact.h \ | 721 | backend/contact.h \ |
788 | passwordbase_p.h | 722 | passwordbase_p.h |
789 | 723 | ||
790 | moc_findwidgetbase_p.o: process_unix.moc \ | 724 | moc_lnkpropertiesbase_p.o: process_unix.moc \ |
791 | process_unix.cpp \ | 725 | process_unix.cpp \ |
792 | process.h | 726 | process.h |
793 | 727 | ||
794 | moc_lnkpropertiesbase_p.o: timestring.moc \ | ||
795 | timestring.cpp \ | ||
796 | timestring.h \ | ||
797 | qpeapplication.h \ | ||
798 | qpedecoration_qws.h \ | ||
799 | config.h | ||
800 | |||
801 | moc_menubutton.cpp: menubutton.h | 728 | moc_menubutton.cpp: menubutton.h |
802 | $(MOC) menubutton.h -o moc_menubutton.cpp | 729 | $(MOC) menubutton.h -o moc_menubutton.cpp |
803 | 730 | ||
804 | moc_proxies.cpp: proxies.h | ||
805 | $(MOC) proxies.h -o moc_proxies.cpp | ||
806 | |||
807 | moc_datebookmonth.cpp: datebookmonth.h | 731 | moc_datebookmonth.cpp: datebookmonth.h |
808 | $(MOC) datebookmonth.h -o moc_datebookmonth.cpp | 732 | $(MOC) datebookmonth.h -o moc_datebookmonth.cpp |
809 | 733 | ||
810 | moc_fileselector.cpp: fileselector.h | 734 | moc_fileselector.cpp: fileselector.h |
811 | $(MOC) fileselector.h -o moc_fileselector.cpp | 735 | $(MOC) fileselector.h -o moc_fileselector.cpp |
812 | 736 | ||
737 | moc_fileselector_p.cpp: fileselector_p.h | ||
738 | $(MOC) fileselector_p.h -o moc_fileselector_p.cpp | ||
739 | |||
813 | moc_imageedit.cpp: imageedit.h | 740 | moc_imageedit.cpp: imageedit.h |
814 | $(MOC) imageedit.h -o moc_imageedit.cpp | 741 | $(MOC) imageedit.h -o moc_imageedit.cpp |
815 | 742 | ||
816 | moc_qpedecoration_qws.cpp: qpedecoration_qws.h | 743 | moc_qpedecoration_qws.cpp: qpedecoration_qws.h |
817 | $(MOC) qpedecoration_qws.h -o moc_qpedecoration_qws.cpp | 744 | $(MOC) qpedecoration_qws.h -o moc_qpedecoration_qws.cpp |
818 | 745 | ||
819 | moc_qpeapplication.cpp: qpeapplication.h | 746 | moc_qpeapplication.cpp: qpeapplication.h |
820 | $(MOC) qpeapplication.h -o moc_qpeapplication.cpp | 747 | $(MOC) qpeapplication.h -o moc_qpeapplication.cpp |
@@ -856,46 +783,34 @@ moc_findwidget_p.cpp: findwidget_p.h | |||
856 | $(MOC) findwidget_p.h -o moc_findwidget_p.cpp | 783 | $(MOC) findwidget_p.h -o moc_findwidget_p.cpp |
857 | 784 | ||
858 | moc_finddialog.cpp: finddialog.h | 785 | moc_finddialog.cpp: finddialog.h |
859 | $(MOC) finddialog.h -o moc_finddialog.cpp | 786 | $(MOC) finddialog.h -o moc_finddialog.cpp |
860 | 787 | ||
861 | moc_lnkproperties.cpp: lnkproperties.h | 788 | moc_lnkproperties.cpp: lnkproperties.h |
862 | $(MOC) lnkproperties.h -o moc_lnkproperties.cpp | 789 | $(MOC) lnkproperties.h -o moc_lnkproperties.cpp |
863 | 790 | ||
864 | moc_qlibrary_p.cpp: qlibrary_p.h | ||
865 | $(MOC) qlibrary_p.h -o moc_qlibrary_p.cpp | ||
866 | |||
867 | moc_qprocess.cpp: qprocess.h | ||
868 | $(MOC) qprocess.h -o moc_qprocess.cpp | ||
869 | |||
870 | global.moc: global.cpp | 791 | global.moc: global.cpp |
871 | $(MOC) global.cpp -o global.moc | 792 | $(MOC) global.cpp -o global.moc |
872 | 793 | ||
873 | network.moc: network.cpp | 794 | network.moc: network.cpp |
874 | $(MOC) network.cpp -o network.moc | 795 | $(MOC) network.cpp -o network.moc |
875 | 796 | ||
876 | password.moc: password.cpp | 797 | password.moc: password.cpp |
877 | $(MOC) password.cpp -o password.moc | 798 | $(MOC) password.cpp -o password.moc |
878 | 799 | ||
879 | process_unix.moc: process_unix.cpp | 800 | process_unix.moc: process_unix.cpp |
880 | $(MOC) process_unix.cpp -o process_unix.moc | 801 | $(MOC) process_unix.cpp -o process_unix.moc |
881 | 802 | ||
882 | timestring.moc: timestring.cpp | 803 | timestring.moc: timestring.cpp |
883 | $(MOC) timestring.cpp -o timestring.moc | 804 | $(MOC) timestring.cpp -o timestring.moc |
884 | 805 | ||
885 | qprocess_unix.moc: qprocess_unix.cpp | ||
886 | $(MOC) qprocess_unix.cpp -o qprocess_unix.moc | ||
887 | |||
888 | moc_passwordbase_p.cpp: passwordbase_p.h | 806 | moc_passwordbase_p.cpp: passwordbase_p.h |
889 | $(MOC) passwordbase_p.h -o moc_passwordbase_p.cpp | 807 | $(MOC) passwordbase_p.h -o moc_passwordbase_p.cpp |
890 | 808 | ||
891 | moc_proxiesbase_p.cpp: proxiesbase_p.h | ||
892 | $(MOC) proxiesbase_p.h -o moc_proxiesbase_p.cpp | ||
893 | |||
894 | moc_categoryeditbase_p.cpp: categoryeditbase_p.h | 809 | moc_categoryeditbase_p.cpp: categoryeditbase_p.h |
895 | $(MOC) categoryeditbase_p.h -o moc_categoryeditbase_p.cpp | 810 | $(MOC) categoryeditbase_p.h -o moc_categoryeditbase_p.cpp |
896 | 811 | ||
897 | moc_findwidgetbase_p.cpp: findwidgetbase_p.h | 812 | moc_findwidgetbase_p.cpp: findwidgetbase_p.h |
898 | $(MOC) findwidgetbase_p.h -o moc_findwidgetbase_p.cpp | 813 | $(MOC) findwidgetbase_p.h -o moc_findwidgetbase_p.cpp |
899 | 814 | ||
900 | moc_lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.h | 815 | moc_lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.h |
901 | $(MOC) lnkpropertiesbase_p.h -o moc_lnkpropertiesbase_p.cpp | 816 | $(MOC) lnkpropertiesbase_p.h -o moc_lnkpropertiesbase_p.cpp |
diff --git a/library/global.cpp b/library/global.cpp index e5fc2b3..fd7579a 100644 --- a/library/global.cpp +++ b/library/global.cpp | |||
@@ -500,17 +500,17 @@ void Global::invoke(const QString &c) | |||
500 | { | 500 | { |
501 | if ( !::vfork() ) { | 501 | if ( !::vfork() ) { |
502 | for ( int fd = 3; fd < 100; fd++ ) | 502 | for ( int fd = 3; fd < 100; fd++ ) |
503 | ::close( fd ); | 503 | ::close( fd ); |
504 | ::setpgid( ::getpid(), ::getppid() ); | 504 | ::setpgid( ::getpid(), ::getppid() ); |
505 | // Try bindir first, so that foo/bar works too | 505 | // Try bindir first, so that foo/bar works too |
506 | ::execv( qpeDir()+"/bin/"+args[0], (char * const *)args ); | 506 | ::execv( qpeDir()+"/bin/"+args[0], (char * const *)args ); |
507 | ::execvp( args[0], (char * const *)args ); | 507 | ::execvp( args[0], (char * const *)args ); |
508 | exit( -1 ); | 508 | _exit( -1 ); |
509 | } | 509 | } |
510 | } | 510 | } |
511 | StartingAppList::add( list[0] ); | 511 | StartingAppList::add( list[0] ); |
512 | #endif //QT_NO_QWS_MULTIPROCESS | 512 | #endif //QT_NO_QWS_MULTIPROCESS |
513 | } | 513 | } |
514 | 514 | ||
515 | /*! | 515 | /*! |
516 | Executes application identfied by \a c, passing \a document. | 516 | Executes application identfied by \a c, passing \a document. |
diff --git a/library/library.pro b/library/library.pro index 058d216..e71e5a0 100644 --- a/library/library.pro +++ b/library/library.pro | |||
@@ -3,22 +3,22 @@ CONFIG += qt warn_on release | |||
3 | HEADERS= calendar.h \ | 3 | HEADERS= calendar.h \ |
4 | global.h \ | 4 | global.h \ |
5 | resource.h \ | 5 | resource.h \ |
6 | xmlreader.h \ | 6 | xmlreader.h \ |
7 | mimetype.h \ | 7 | mimetype.h \ |
8 | menubutton.h \ | 8 | menubutton.h \ |
9 | network.h \ | 9 | network.h \ |
10 | networkinterface.h \ | 10 | networkinterface.h \ |
11 | proxies.h \ | ||
12 | filemanager.h \ | 11 | filemanager.h \ |
13 | fontmanager.h \ | 12 | fontmanager.h \ |
14 | qdawg.h \ | 13 | qdawg.h \ |
15 | datebookmonth.h \ | 14 | datebookmonth.h \ |
16 | fileselector.h \ | 15 | fileselector.h \ |
16 | fileselector_p.h \ | ||
17 | imageedit.h \ | 17 | imageedit.h \ |
18 | qcopenvelope_qws.h \ | 18 | qcopenvelope_qws.h \ |
19 | qpedecoration_qws.h \ | 19 | qpedecoration_qws.h \ |
20 | qpeapplication.h \ | 20 | qpeapplication.h \ |
21 | qpestyle.h \ | 21 | qpestyle.h \ |
22 | qpedialog.h \ | 22 | qpedialog.h \ |
23 | lightstyle.h \ | 23 | lightstyle.h \ |
24 | config.h \ | 24 | config.h \ |
@@ -59,17 +59,16 @@ HEADERS = calendar.h \ | |||
59 | 59 | ||
60 | SOURCES= calendar.cpp \ | 60 | SOURCES= calendar.cpp \ |
61 | global.cpp \ | 61 | global.cpp \ |
62 | xmlreader.cpp \ | 62 | xmlreader.cpp \ |
63 | mimetype.cpp \ | 63 | mimetype.cpp \ |
64 | menubutton.cpp \ | 64 | menubutton.cpp \ |
65 | network.cpp \ | 65 | network.cpp \ |
66 | networkinterface.cpp \ | 66 | networkinterface.cpp \ |
67 | proxies.cpp \ | ||
68 | filemanager.cpp \ | 67 | filemanager.cpp \ |
69 | fontmanager.cpp \ | 68 | fontmanager.cpp \ |
70 | qdawg.cpp \ | 69 | qdawg.cpp \ |
71 | datebookmonth.cpp \ | 70 | datebookmonth.cpp \ |
72 | fileselector.cpp \ | 71 | fileselector.cpp \ |
73 | imageedit.cpp \ | 72 | imageedit.cpp \ |
74 | resource.cpp \ | 73 | resource.cpp \ |
75 | qpedecoration_qws.cpp \ | 74 | qpedecoration_qws.cpp \ |
@@ -110,23 +109,22 @@ SOURCES = calendar.cpp \ | |||
110 | ir.cpp \ | 109 | ir.cpp \ |
111 | backend/vcc_yacc.cpp \ | 110 | backend/vcc_yacc.cpp \ |
112 | backend/vobject.cpp \ | 111 | backend/vobject.cpp \ |
113 | findwidget_p.cpp \ | 112 | findwidget_p.cpp \ |
114 | finddialog.cpp \ | 113 | finddialog.cpp \ |
115 | lnkproperties.cpp | 114 | lnkproperties.cpp |
116 | 115 | ||
117 | # Qt 3 compatibility | 116 | # Qt 3 compatibility |
118 | qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h | 117 | qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h |
119 | qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \ | 118 | qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp |
120 | qprocess_unix.cpp | ||
121 | 119 | ||
122 | INCLUDEPATH += $(OPIEDIR)/include backend | 120 | INCLUDEPATH += $(OPIEDIR)/include backend |
123 | LIBS += -ldl -lcrypt -lm | 121 | LIBS += -ldl -lcrypt -lm |
124 | 122 | ||
125 | INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui | 123 | INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui |
126 | 124 | ||
127 | TARGET = qpe | 125 | TARGET = qpe |
128 | DESTDIR = $(QTDIR)/lib$(PROJMAK) | 126 | DESTDIR = $(QTDIR)/lib$(PROJMAK) |
129 | # This is set by configure$(OPIEDIR). | 127 | # This is set by configure$(OPIEDIR). |
130 | VERSION = 1.5.0 | 128 | VERSION = 1.5.0 |
131 | 129 | ||
132 | TRANSLATIONS = ../i18n/de/libqpe.ts | 130 | TRANSLATIONS = ../i18n/de/libqpe.ts |