summaryrefslogtreecommitdiff
path: root/library
authorkergoth <kergoth>2002-01-31 18:35:48 (UTC)
committer kergoth <kergoth>2002-01-31 18:35:48 (UTC)
commit2802e5a2b474101a50bf95e707061ca5542876fd (patch) (side-by-side diff)
treea1015514ef9e48df091903cccf0d3174e272f663 /library
parent48a922e687e82dc8ebe2bc3cb17dcaa8dcae62bd (diff)
downloadopie-2802e5a2b474101a50bf95e707061ca5542876fd.zip
opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.gz
opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.bz2
*** empty log message ***
Diffstat (limited to 'library') (more/less context) (ignore whitespace changes)
-rw-r--r--library/Makefile.in125
-rw-r--r--library/global.cpp2
-rw-r--r--library/library.pro10
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
@@ -28,18 +28,18 @@ HEADERS = calendar.h \
resource.h \
xmlreader.h \
mimetype.h \
menubutton.h \
network.h \
networkinterface.h \
- proxies.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 \
@@ -75,26 +75,20 @@ HEADERS = calendar.h \
categoryselect.h \
categorywidget.h \
ir.h \
backend/vobject_p.h \
findwidget_p.h \
finddialog.h \
- lnkproperties.h \
- quuid.h \
- qcom.h \
- qlibrary.h \
- qlibrary_p.h \
- qprocess.h
+ lnkproperties.h
SOURCES = calendar.cpp \
global.cpp \
xmlreader.cpp \
mimetype.cpp \
menubutton.cpp \
network.cpp \
networkinterface.cpp \
- proxies.cpp \
filemanager.cpp \
fontmanager.cpp \
qdawg.cpp \
datebookmonth.cpp \
fileselector.cpp \
imageedit.cpp \
@@ -136,26 +130,20 @@ SOURCES = calendar.cpp \
categorywidget.cpp \
ir.cpp \
backend/vcc_yacc.cpp \
backend/vobject.cpp \
findwidget_p.cpp \
finddialog.cpp \
- lnkproperties.cpp \
- quuid.cpp \
- qlibrary.cpp \
- qlibrary_unix.cpp \
- qprocess.cpp \
- qprocess_unix.cpp
+ lnkproperties.cpp
OBJECTS = calendar.o \
global.o \
xmlreader.o \
mimetype.o \
menubutton.o \
network.o \
networkinterface.o \
- proxies.o \
filemanager.o \
fontmanager.o \
qdawg.o \
datebookmonth.o \
fileselector.o \
imageedit.o \
@@ -198,41 +186,32 @@ OBJECTS = calendar.o \
ir.o \
backend/vcc_yacc.o \
backend/vobject.o \
findwidget_p.o \
finddialog.o \
lnkproperties.o \
- quuid.o \
- qlibrary.o \
- qlibrary_unix.o \
- qprocess.o \
- qprocess_unix.o \
passwordbase_p.o \
- proxiesbase_p.o \
categoryeditbase_p.o \
findwidgetbase_p.o \
lnkpropertiesbase_p.o
INTERFACES = passwordbase_p.ui \
- proxiesbase_p.ui \
categoryeditbase_p.ui \
findwidgetbase_p.ui \
lnkpropertiesbase_p.ui
UICDECLS = passwordbase_p.h \
- proxiesbase_p.h \
categoryeditbase_p.h \
findwidgetbase_p.h \
lnkpropertiesbase_p.h
UICIMPLS = passwordbase_p.cpp \
- proxiesbase_p.cpp \
categoryeditbase_p.cpp \
findwidgetbase_p.cpp \
lnkpropertiesbase_p.cpp
SRCMOC = moc_menubutton.cpp \
- moc_proxies.cpp \
moc_datebookmonth.cpp \
moc_fileselector.cpp \
+ moc_fileselector_p.cpp \
moc_imageedit.cpp \
moc_qpedecoration_qws.cpp \
moc_qpeapplication.cpp \
moc_qpedialog.cpp \
moc_tzselect.cpp \
moc_process.cpp \
@@ -244,29 +223,25 @@ SRCMOC = moc_menubutton.cpp \
moc_categoryedit_p.cpp \
moc_categoryselect.cpp \
moc_ir.cpp \
moc_findwidget_p.cpp \
moc_finddialog.cpp \
moc_lnkproperties.cpp \
- moc_qlibrary_p.cpp \
- moc_qprocess.cpp \
global.moc \
network.moc \
password.moc \
process_unix.moc \
timestring.moc \
- qprocess_unix.moc \
moc_passwordbase_p.cpp \
- moc_proxiesbase_p.cpp \
moc_categoryeditbase_p.cpp \
moc_findwidgetbase_p.cpp \
moc_lnkpropertiesbase_p.cpp
OBJMOC = moc_menubutton.o \
- moc_proxies.o \
moc_datebookmonth.o \
moc_fileselector.o \
+ moc_fileselector_p.o \
moc_imageedit.o \
moc_qpedecoration_qws.o \
moc_qpeapplication.o \
moc_qpedialog.o \
moc_tzselect.o \
moc_process.o \
@@ -278,16 +253,13 @@ OBJMOC = moc_menubutton.o \
moc_categoryedit_p.o \
moc_categoryselect.o \
moc_ir.o \
moc_findwidget_p.o \
moc_finddialog.o \
moc_lnkproperties.o \
- moc_qlibrary_p.o \
- moc_qprocess.o \
moc_passwordbase_p.o \
- moc_proxiesbase_p.o \
moc_categoryeditbase_p.o \
moc_findwidgetbase_p.o \
moc_lnkpropertiesbase_p.o
####### Implicit rules
@@ -316,14 +288,16 @@ all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
$(SYSCONF_LINK_LIB)
moc: $(SRCMOC)
-tmake:
- tmake library.pro
+tmake: Makefile.in
+
+Makefile.in: library.pro
+ tmake library.pro -o Makefile.in
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
-rm -f *~ core
-rm -f allmoc.cpp
@@ -378,17 +352,12 @@ network.o: network.cpp \
networkinterface.o: networkinterface.cpp \
networkinterface.h \
network.h \
config.h
-proxies.o: proxies.cpp \
- proxies.h \
- config.h \
- proxiesbase_p.h
-
filemanager.o: filemanager.cpp \
filemanager.h \
applnk.h
fontmanager.o: fontmanager.cpp \
fontmanager.h
@@ -407,12 +376,13 @@ datebookmonth.o: datebookmonth.cpp \
qpedecoration_qws.h
fileselector.o: fileselector.cpp \
fileselector.h \
filemanager.h \
applnk.h \
+ fileselector_p.h \
global.h \
resource.h \
config.h \
storage.h \
qpemenubar.h \
lnkproperties.h \
@@ -531,14 +501,13 @@ fontdatabase.o: fontdatabase.cpp \
qpedecoration_qws.h \
timestring.h \
fontfactoryinterface.h \
fontdatabase.h
power.o: power.cpp \
- power.h \
- custom.h
+ power.h
storage.o: storage.cpp
qpemessagebox.o: qpemessagebox.cpp \
qpemessagebox.h
@@ -630,43 +599,18 @@ finddialog.o: finddialog.cpp \
lnkproperties.o: lnkproperties.cpp \
lnkproperties.h \
lnkpropertiesbase_p.h \
ir.h
-quuid.o: quuid.cpp \
- quuid.h
-
-qlibrary.o: qlibrary.cpp \
- qlibrary_p.h \
- qlibrary.h
-
-qlibrary_unix.o: qlibrary_unix.cpp \
- qlibrary_p.h \
- qlibrary.h
-
-qprocess.o: qprocess.cpp \
- qprocess.h
-
-qprocess_unix.o: qprocess_unix.cpp \
- qprocess_unix.moc \
- qprocess.h \
- qcleanuphandler_p.h
-
passwordbase_p.h: passwordbase_p.ui
$(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h
passwordbase_p.cpp: passwordbase_p.ui
$(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp
-proxiesbase_p.h: proxiesbase_p.ui
- $(UIC) proxiesbase_p.ui -o $(INTERFACE_DECL_PATH)/proxiesbase_p.h
-
-proxiesbase_p.cpp: proxiesbase_p.ui
- $(UIC) proxiesbase_p.ui -i proxiesbase_p.h -o proxiesbase_p.cpp
-
categoryeditbase_p.h: categoryeditbase_p.ui
$(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h
categoryeditbase_p.cpp: categoryeditbase_p.ui
$(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp
@@ -681,37 +625,34 @@ lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui
lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui
$(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp
passwordbase_p.o: passwordbase_p.cpp
-proxiesbase_p.o: proxiesbase_p.cpp
-
categoryeditbase_p.o: categoryeditbase_p.cpp
findwidgetbase_p.o: findwidgetbase_p.cpp
lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp
moc_menubutton.o: moc_menubutton.cpp \
menubutton.h
-moc_proxies.o: moc_proxies.cpp \
- proxies.h \
- config.h
-
moc_datebookmonth.o: moc_datebookmonth.cpp \
datebookmonth.h \
calendar.h \
timestring.h
moc_fileselector.o: moc_fileselector.cpp \
fileselector.h \
filemanager.h \
applnk.h
+moc_fileselector_p.o: moc_fileselector_p.cpp \
+ fileselector_p.h
+
moc_imageedit.o: moc_imageedit.cpp \
imageedit.h
moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \
qpedecoration_qws.h
@@ -763,56 +704,42 @@ moc_findwidget_p.o: moc_findwidget_p.cpp \
moc_finddialog.o: moc_finddialog.cpp \
finddialog.h
moc_lnkproperties.o: moc_lnkproperties.cpp \
lnkproperties.h
-moc_qlibrary_p.o: moc_qlibrary_p.cpp \
- qlibrary_p.h \
- qlibrary.h
-
-moc_qprocess.o: moc_qprocess.cpp \
- qprocess.h
-
moc_passwordbase_p.o: global.moc \
global.cpp
-moc_proxiesbase_p.o: network.moc \
+moc_categoryeditbase_p.o: network.moc \
network.cpp
-moc_categoryeditbase_p.o: password.moc \
+moc_findwidgetbase_p.o: password.moc \
password.cpp \
password.h \
config.h \
global.h \
backend/contact.h \
passwordbase_p.h
-moc_findwidgetbase_p.o: process_unix.moc \
+moc_lnkpropertiesbase_p.o: process_unix.moc \
process_unix.cpp \
process.h
-moc_lnkpropertiesbase_p.o: timestring.moc \
- timestring.cpp \
- timestring.h \
- qpeapplication.h \
- qpedecoration_qws.h \
- config.h
-
moc_menubutton.cpp: menubutton.h
$(MOC) menubutton.h -o moc_menubutton.cpp
-moc_proxies.cpp: proxies.h
- $(MOC) proxies.h -o moc_proxies.cpp
-
moc_datebookmonth.cpp: datebookmonth.h
$(MOC) datebookmonth.h -o moc_datebookmonth.cpp
moc_fileselector.cpp: fileselector.h
$(MOC) fileselector.h -o moc_fileselector.cpp
+moc_fileselector_p.cpp: fileselector_p.h
+ $(MOC) fileselector_p.h -o moc_fileselector_p.cpp
+
moc_imageedit.cpp: imageedit.h
$(MOC) imageedit.h -o moc_imageedit.cpp
moc_qpedecoration_qws.cpp: qpedecoration_qws.h
$(MOC) qpedecoration_qws.h -o moc_qpedecoration_qws.cpp
@@ -858,18 +785,12 @@ moc_findwidget_p.cpp: findwidget_p.h
moc_finddialog.cpp: finddialog.h
$(MOC) finddialog.h -o moc_finddialog.cpp
moc_lnkproperties.cpp: lnkproperties.h
$(MOC) lnkproperties.h -o moc_lnkproperties.cpp
-moc_qlibrary_p.cpp: qlibrary_p.h
- $(MOC) qlibrary_p.h -o moc_qlibrary_p.cpp
-
-moc_qprocess.cpp: qprocess.h
- $(MOC) qprocess.h -o moc_qprocess.cpp
-
global.moc: global.cpp
$(MOC) global.cpp -o global.moc
network.moc: network.cpp
$(MOC) network.cpp -o network.moc
@@ -879,21 +800,15 @@ password.moc: password.cpp
process_unix.moc: process_unix.cpp
$(MOC) process_unix.cpp -o process_unix.moc
timestring.moc: timestring.cpp
$(MOC) timestring.cpp -o timestring.moc
-qprocess_unix.moc: qprocess_unix.cpp
- $(MOC) qprocess_unix.cpp -o qprocess_unix.moc
-
moc_passwordbase_p.cpp: passwordbase_p.h
$(MOC) passwordbase_p.h -o moc_passwordbase_p.cpp
-moc_proxiesbase_p.cpp: proxiesbase_p.h
- $(MOC) proxiesbase_p.h -o moc_proxiesbase_p.cpp
-
moc_categoryeditbase_p.cpp: categoryeditbase_p.h
$(MOC) categoryeditbase_p.h -o moc_categoryeditbase_p.cpp
moc_findwidgetbase_p.cpp: findwidgetbase_p.h
$(MOC) findwidgetbase_p.h -o moc_findwidgetbase_p.cpp
diff --git a/library/global.cpp b/library/global.cpp
index e5fc2b3..fd7579a 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -502,13 +502,13 @@ void Global::invoke(const QString &c)
for ( int fd = 3; fd < 100; fd++ )
::close( fd );
::setpgid( ::getpid(), ::getppid() );
// Try bindir first, so that foo/bar works too
::execv( qpeDir()+"/bin/"+args[0], (char * const *)args );
::execvp( args[0], (char * const *)args );
- exit( -1 );
+ _exit( -1 );
}
}
StartingAppList::add( list[0] );
#endif //QT_NO_QWS_MULTIPROCESS
}
diff --git a/library/library.pro b/library/library.pro
index 058d216..e71e5a0 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -5,18 +5,18 @@ HEADERS = calendar.h \
resource.h \
xmlreader.h \
mimetype.h \
menubutton.h \
network.h \
networkinterface.h \
- proxies.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 \
@@ -61,13 +61,12 @@ SOURCES = calendar.cpp \
global.cpp \
xmlreader.cpp \
mimetype.cpp \
menubutton.cpp \
network.cpp \
networkinterface.cpp \
- proxies.cpp \
filemanager.cpp \
fontmanager.cpp \
qdawg.cpp \
datebookmonth.cpp \
fileselector.cpp \
imageedit.cpp \
@@ -112,20 +111,19 @@ SOURCES = calendar.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 qprocess.h
-qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \
- qprocess_unix.cpp
+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 proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
+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