summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure19
-rw-r--r--core/applets/clipboardapplet/Makefile.in8
-rw-r--r--core/apps/embeddedkonsole/Makefile.in14
-rw-r--r--core/launcher/launcher.pro2
-rw-r--r--core/launcher/launcherview.cpp27
-rw-r--r--core/multimedia/opieplayer/Makefile.in64
-rw-r--r--core/multimedia/opieplayer/libflash/Makefile.in9
-rw-r--r--core/multimedia/opieplayer/libmad/Makefile.in11
-rw-r--r--core/multimedia/opieplayer/libmpeg3/Makefile.in13
-rw-r--r--core/multimedia/opieplayer/wavplugin/Makefile.in13
-rw-r--r--core/pim/datebook/Makefile.in119
-rw-r--r--docs/start.doc51
-rw-r--r--library/Makefile.in125
-rw-r--r--library/global.cpp2
-rw-r--r--library/library.pro10
-rw-r--r--noncore/games/chess/Makefile.in16
-rw-r--r--noncore/games/go/Makefile.in15
17 files changed, 159 insertions, 359 deletions
diff --git a/configure b/configure
index 7824e36..3b474c6 100755
--- a/configure
+++ b/configure
@@ -7,3 +7,3 @@
-PLATFORM=linux-generic-g++
+PLATFORM=generic
SHARING=shared
@@ -31,8 +31,5 @@ rm .test.qpe.
-mkdir -p include/qpe
-( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
-
-VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <include/qpe/version.h)
-VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <include/qpe/version.h)
-VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <include/qpe/version.h)
+VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <library/version.h)
+VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <library/version.h)
+VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <library/version.h)
@@ -119,2 +116,10 @@ fi
+if [ -f library/custom-$PLATFORM.h ]
+then
+ rm -f library/custom.h
+ ln -s custom-$PLATFORM.h library/custom.h
+fi
+
+mkdir -p include/qpe
+( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
diff --git a/core/applets/clipboardapplet/Makefile.in b/core/applets/clipboardapplet/Makefile.in
index 2ddeb42..c42404e 100644
--- a/core/applets/clipboardapplet/Makefile.in
+++ b/core/applets/clipboardapplet/Makefile.in
@@ -8,3 +8,3 @@ CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-INCPATH = -I$(QPEDIR)/include
+INCPATH = -I$(OPIEDIR)/include
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -67,4 +67,6 @@ moc: $(SRCMOC)
-tmake:
- tmake clipboardapplet.pro
+tmake: Makefile.in
+
+Makefile.in: clipboardapplet.pro
+ tmake clipboardapplet.pro -o Makefile.in
diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in
index 8a69557..0da49d7 100644
--- a/core/apps/embeddedkonsole/Makefile.in
+++ b/core/apps/embeddedkonsole/Makefile.in
@@ -101,4 +101,6 @@ moc: $(SRCMOC)
-tmake:
- tmake embeddedkonsole.pro
+tmake: Makefile.in
+
+Makefile.in: embeddedkonsole.pro
+ tmake embeddedkonsole.pro -o Makefile.in
@@ -185,3 +187,2 @@ keytrans.o: keytrans.cpp \
keytrans.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
default.keytab.h
@@ -189,6 +190,2 @@ keytrans.o: keytrans.cpp \
konsole.o: konsole.cpp \
- $(OPIEDIR)/include/qpe/resource.h \
- $(OPIEDIR)/include/qpe/qpetoolbar.h \
- $(OPIEDIR)/include/qpe/qpemenubar.h \
- $(OPIEDIR)/include/qpe/config.h \
konsole.h \
@@ -214,4 +211,3 @@ main.o: main.cpp \
keytrans.h \
- session.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h
+ session.h
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index 0078faf..32cb95f 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -8,2 +8,3 @@ HEADERS = background.h \
desktop.h \
+ qprocess.h \
info.h \
@@ -48,2 +49,3 @@ SOURCES = background.cpp \
desktop.cpp \
+ qprocess.cpp qprocess_unix.cpp \
info.cpp \
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index ed39720..e8741a2 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -214,6 +214,4 @@ public:
case Date: {
- QFileInfo fa(a->linkFile());
- if ( !fa.exists() ) fa.setFile(a->file());
- QFileInfo fb(b->linkFile());
- if ( !fb.exists() ) fb.setFile(b->file());
+ QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
+ QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
return fa.lastModified().secsTo(fb.lastModified());
@@ -364,2 +362,4 @@ void LauncherIconView::hideOrShowItems(bool resort)
}
+ bool oldAutoArrange = autoArrange();
+ setAutoArrange( FALSE );
clear();
@@ -373,2 +373,3 @@ void LauncherIconView::hideOrShowItems(bool resort)
sort();
+ setAutoArrange( oldAutoArrange );
}
@@ -378,6 +379,11 @@ bool LauncherIconView::removeLink(const QString& linkfile)
LauncherItem* item = (LauncherItem*)firstItem();
+ AppLnk* l;
+ bool did = FALSE;
+ DocLnk dl(linkfile);
while (item) {
- if ( item->appLnk()->linkFile() == linkfile ) {
+ l = item->appLnk();
+ if ( l->linkFileKnown() && l->linkFile() == linkfile || l->file() == linkfile
+ || dl.isValid() && dl.file() == l->file() ) {
delete item;
- return TRUE;
+ did = TRUE;
}
@@ -386,11 +392,12 @@ bool LauncherIconView::removeLink(const QString& linkfile)
QListIterator<AppLnk> it(hidden);
- AppLnk* l;
while ((l=it.current())) {
++it;
- if ( l->linkFile() == linkfile ) {
+ if ( l->linkFileKnown() && l->linkFile() == linkfile
+ || l->file() == linkfile
+ || dl.isValid() && dl.file() == l->file() ) {
hidden.removeRef(l);
- return TRUE;
+ did = TRUE;
}
}
- return FALSE;
+ return did;
}
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 6e007ec..3e1f9fc 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -102,4 +102,6 @@ moc: $(SRCMOC)
-tmake:
- tmake mpegplayer.pro
+tmake: Makefile.in
+
+Makefile.in: mpegplayer.pro
+ tmake mpegplayer.pro -o Makefile.in
@@ -137,6 +139,4 @@ REQUIRES=
main.o: main.cpp \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
mediaplayerstate.h \
playlistwidget.h \
- $(OPIEDIR)/include/qpe/applnk.h \
audiowidget.h \
@@ -144,11 +144,5 @@ main.o: main.cpp \
loopcontrol.h \
- mediaplayer.h \
- $(OPIEDIR)/include/qpe/qlibrary.h \
- $(OPIEDIR)/include/qpe/qcom.h \
- $(OPIEDIR)/include/qpe/quuid.h \
- mediaplayerplugininterface.h
+ mediaplayer.h
loopcontrol.o: loopcontrol.cpp \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
loopcontrol.h \
@@ -156,5 +150,2 @@ loopcontrol.o: loopcontrol.cpp \
audiodevice.h \
- mediaplayerplugininterface.h \
- $(OPIEDIR)/include/qpe/qcom.h \
- $(OPIEDIR)/include/qpe/quuid.h \
mediaplayerstate.h
@@ -162,4 +153,2 @@ loopcontrol.o: loopcontrol.cpp \
playlistselection.o: playlistselection.cpp \
- $(OPIEDIR)/include/qpe/applnk.h \
- $(OPIEDIR)/include/qpe/resource.h \
playlistselection.h
@@ -167,8 +156,2 @@ playlistselection.o: playlistselection.cpp \
mediaplayerstate.o: mediaplayerstate.cpp \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/qlibrary.h \
- $(OPIEDIR)/include/qpe/qcom.h \
- $(OPIEDIR)/include/qpe/quuid.h \
- $(OPIEDIR)/include/qpe/config.h \
- mediaplayerplugininterface.h \
mediaplayerstate.h \
@@ -179,7 +162,3 @@ mediaplayerstate.o: mediaplayerstate.cpp \
videowidget.o: videowidget.cpp \
- $(OPIEDIR)/include/qpe/resource.h \
videowidget.h \
- mediaplayerplugininterface.h \
- $(OPIEDIR)/include/qpe/qcom.h \
- $(OPIEDIR)/include/qpe/quuid.h \
mediaplayerstate.h
@@ -187,3 +166,2 @@ videowidget.o: videowidget.cpp \
audiowidget.o: audiowidget.cpp \
- $(OPIEDIR)/include/qpe/resource.h \
audiowidget.h \
@@ -192,9 +170,2 @@ audiowidget.o: audiowidget.cpp \
playlistwidget.o: playlistwidget.cpp \
- $(OPIEDIR)/include/qpe/qpemenubar.h \
- $(OPIEDIR)/include/qpe/qpetoolbar.h \
- $(OPIEDIR)/include/qpe/fileselector.h \
- $(OPIEDIR)/include/qpe/applnk.h \
- $(OPIEDIR)/include/qpe/config.h \
- $(OPIEDIR)/include/qpe/global.h \
- $(OPIEDIR)/include/qpe/resource.h \
playlistselection.h \
@@ -204,12 +175,4 @@ playlistwidget.o: playlistwidget.cpp \
mediaplayer.o: mediaplayer.cpp \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/qlibrary.h \
- $(OPIEDIR)/include/qpe/qcom.h \
- $(OPIEDIR)/include/qpe/quuid.h \
- $(OPIEDIR)/include/qpe/resource.h \
- $(OPIEDIR)/include/qpe/config.h \
mediaplayer.h \
- mediaplayerplugininterface.h \
playlistwidget.h \
- $(OPIEDIR)/include/qpe/applnk.h \
audiowidget.h \
@@ -220,6 +183,3 @@ mediaplayer.o: mediaplayer.cpp \
audiodevice.o: audiodevice.cpp \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/config.h \
- audiodevice.h \
- $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
+ audiodevice.h
@@ -229,4 +189,3 @@ moc_loopcontrol.o: moc_loopcontrol.cpp \
moc_playlistselection.o: moc_playlistselection.cpp \
- playlistselection.h \
- $(OPIEDIR)/include/qpe/applnk.h
+ playlistselection.h
@@ -242,11 +201,6 @@ moc_audiowidget.o: moc_audiowidget.cpp \
moc_playlistwidget.o: moc_playlistwidget.cpp \
- playlistwidget.h \
- $(OPIEDIR)/include/qpe/applnk.h
+ playlistwidget.h
moc_mediaplayer.o: moc_mediaplayer.cpp \
- mediaplayer.h \
- $(OPIEDIR)/include/qpe/qlibrary.h \
- $(OPIEDIR)/include/qpe/qcom.h \
- $(OPIEDIR)/include/qpe/quuid.h \
- mediaplayerplugininterface.h
+ mediaplayer.h
diff --git a/core/multimedia/opieplayer/libflash/Makefile.in b/core/multimedia/opieplayer/libflash/Makefile.in
index 52c8557..0947454 100644
--- a/core/multimedia/opieplayer/libflash/Makefile.in
+++ b/core/multimedia/opieplayer/libflash/Makefile.in
@@ -8,3 +8,3 @@ CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-INCPATH = -I$(QPEDIR)/include
+INCPATH = -I$(OPIEDIR)/include -I..
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -147,4 +147,3 @@ libflashplugin.o: libflashplugin.cpp \
libflashplugin.h \
- flash.h \
- ../mediaplayerplugininterface.h
+ flash.h
@@ -153,5 +152,3 @@ libflashpluginimpl.o: libflashpluginimpl.cpp \
flash.h \
- ../mediaplayerplugininterface.h \
- libflashpluginimpl.h \
- ../mediaplayerplugininterface.h
+ libflashpluginimpl.h
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index 19ded26..d2e1cda 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -102,4 +102,6 @@ moc: $(SRCMOC)
-tmake:
- tmake libmad.pro
+tmake: Makefile.in
+
+Makefile.in: libmad.pro
+ tmake libmad.pro -o Makefile.in
@@ -216,3 +218,2 @@ libmadplugin.o: libmadplugin.cpp \
libmadplugin.h \
- ../mediaplayerplugininterface.h \
mad.h
@@ -221,5 +222,3 @@ libmadpluginimpl.o: libmadpluginimpl.cpp \
libmadplugin.h \
- ../mediaplayerplugininterface.h \
- libmadpluginimpl.h \
- ../mediaplayerplugininterface.h
+ libmadpluginimpl.h
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 9881815..4ccdb8c 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -131,4 +131,6 @@ moc: $(SRCMOC)
-tmake:
- tmake libmpeg3.pro
+tmake: Makefile.in
+
+Makefile.in: libmpeg3.pro
+ tmake libmpeg3.pro -o Makefile.in
@@ -178,4 +180,3 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
video/mpeg3video.h \
- mpeg3protos.h \
- ../mediaplayerplugininterface.h
+ mpeg3protos.h
@@ -195,5 +196,3 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
mpeg3protos.h \
- ../mediaplayerplugininterface.h \
- libmpeg3pluginimpl.h \
- ../mediaplayerplugininterface.h
+ libmpeg3pluginimpl.h
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index e9fec6c..560534e 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -67,4 +67,6 @@ moc: $(SRCMOC)
-tmake:
- tmake wavplugin.pro
+tmake: Makefile.in
+
+Makefile.in: wavplugin.pro
+ tmake wavplugin.pro -o Makefile.in
@@ -102,4 +104,3 @@ REQUIRES=
wavplugin.o: wavplugin.cpp \
- wavplugin.h \
- ../mediaplayerplugininterface.h
+ wavplugin.h
@@ -107,5 +108,3 @@ wavpluginimpl.o: wavpluginimpl.cpp \
wavplugin.h \
- ../mediaplayerplugininterface.h \
- wavpluginimpl.h \
- ../mediaplayerplugininterface.h
+ wavpluginimpl.h
diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in
index 0c3282e..cc31efe 100644
--- a/core/pim/datebook/Makefile.in
+++ b/core/pim/datebook/Makefile.in
@@ -126,4 +126,6 @@ moc: $(SRCMOC)
-tmake:
- tmake datebook.pro
+tmake: Makefile.in
+
+Makefile.in: datebook.pro
+ tmake datebook.pro -o Makefile.in
@@ -161,9 +163,3 @@ REQUIRES=
main.o: main.cpp \
- datebook.h \
- $(OPIEDIR)/include/qpe/datebookdb.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h
+ datebook.h
@@ -171,13 +167,4 @@ datebookday.o: datebookday.cpp \
datebookday.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h \
datebookdayheaderimpl.h \
- datebookdayheader.h \
- $(OPIEDIR)/include/qpe/datebookdb.h \
- $(OPIEDIR)/include/qpe/resource.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/timestring.h \
- $(OPIEDIR)/include/qpe/qpedebug.h
+ datebookdayheader.h
@@ -185,7 +172,2 @@ datebook.o: datebook.cpp \
datebook.h \
- $(OPIEDIR)/include/qpe/datebookdb.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h \
datebookday.h \
@@ -195,17 +177,3 @@ datebook.o: datebook.cpp \
dateentryimpl.h \
- dateentry.h \
- $(OPIEDIR)/include/qpe/datebookmonth.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/config.h \
- $(OPIEDIR)/include/qpe/qpedebug.h \
- $(OPIEDIR)/include/qpe/finddialog.h \
- $(OPIEDIR)/include/qpe/ir.h \
- $(OPIEDIR)/include/qpe/qpemenubar.h \
- $(OPIEDIR)/include/qpe/qpemessagebox.h \
- $(OPIEDIR)/include/qpe/resource.h \
- $(OPIEDIR)/include/qpe/sound.h \
- $(OPIEDIR)/include/qpe/timestring.h \
- $(OPIEDIR)/include/qpe/qpetoolbar.h \
- $(OPIEDIR)/include/qpe/tzselect.h \
- $(OPIEDIR)/include/qpe/xmlreader.h
+ dateentry.h
@@ -214,14 +182,4 @@ dateentryimpl.o: dateentryimpl.cpp \
dateentry.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h \
repeatentry.h \
- repeatentrybase.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/categoryselect.h \
- $(OPIEDIR)/include/qpe/datebookmonth.h \
- $(OPIEDIR)/include/qpe/global.h \
- $(OPIEDIR)/include/qpe/timestring.h \
- $(OPIEDIR)/include/qpe/tzselect.h
+ repeatentrybase.h
@@ -229,9 +187,3 @@ datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \
datebookdayheaderimpl.h \
- datebookdayheader.h \
- $(OPIEDIR)/include/qpe/datebookmonth.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h \
- $(OPIEDIR)/include/qpe/timestring.h
+ datebookdayheader.h
@@ -239,4 +191,3 @@ datebooksettings.o: datebooksettings.cpp \
datebooksettings.h \
- datebooksettingsbase.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h
+ datebooksettingsbase.h
@@ -244,12 +195,4 @@ datebookweek.o: datebookweek.cpp \
datebookweek.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h \
datebookweekheaderimpl.h \
- datebookweekheader.h \
- $(OPIEDIR)/include/qpe/calendar.h \
- $(OPIEDIR)/include/qpe/datebookdb.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/timestring.h
+ datebookweekheader.h
@@ -261,10 +204,3 @@ repeatentry.o: repeatentry.cpp \
repeatentry.h \
- repeatentrybase.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h \
- $(OPIEDIR)/include/qpe/datebookmonth.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/timestring.h
+ repeatentrybase.h
@@ -311,15 +247,6 @@ repeatentrybase.o: repeatentrybase.cpp
moc_datebookday.o: moc_datebookday.cpp \
- datebookday.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h
+ datebookday.h
moc_datebook.o: moc_datebook.cpp \
- datebook.h \
- $(OPIEDIR)/include/qpe/datebookdb.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h
+ datebook.h
@@ -327,7 +254,3 @@ moc_dateentryimpl.o: moc_dateentryimpl.cpp \
dateentryimpl.h \
- dateentry.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h
+ dateentry.h
@@ -338,7 +261,3 @@ moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
moc_datebookweek.o: moc_datebookweek.cpp \
- datebookweek.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h
+ datebookweek.h
@@ -350,7 +269,3 @@ moc_repeatentry.o: moc_repeatentry.cpp \
repeatentry.h \
- repeatentrybase.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h
+ repeatentrybase.h
diff --git a/docs/start.doc b/docs/start.doc
index 01b6ab1..53a4e36 100644
--- a/docs/start.doc
+++ b/docs/start.doc
@@ -60,7 +60,7 @@ To compile the example program for running on the Linux desktop:
<pre>
- export OPIEDIR=/opt/Qtopia
- export QTDIR=/opt/Qtopia
- export PATH=$QTDIR/bin:$PATH
- export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
- export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
+ export QPEDIR=/opt/Qtopia
+ export QTDIR=/opt/Qtopia
+ export PATH=$QTDIR/bin:$PATH
+ export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
+ export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
</pre>
@@ -71,3 +71,3 @@ To compile the example program for running on the Linux desktop:
cd somewhere
- cp -r $OPIEDIR/example .
+ cp -r $QPEDIR/example .
cd example
@@ -91,5 +91,5 @@ To compile the example program for running on the Linux desktop:
su # root privileges required to install
- cp example.desktop $OPIEDIR/apps/Applications
- cp Example.png $OPIEDIR/pics
- cp example $OPIEDIR/bin
+ cp example.desktop $QPEDIR/apps/Applications
+ cp Example.png $QPEDIR/pics
+ cp example $QPEDIR/bin
exit # no need to be root anymore
@@ -137,10 +137,9 @@ on the desktop, the process is similar:
<pre>
- export OPIEDIR=/opt/Qtopia/sharp
- export QTDIR=/opt/Qtopia/sharp
- export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH
- export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
+ export QPEDIR=/opt/Qtopia/sharp
+ export QTDIR=/opt/Qtopia/sharp
+ export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH
+ export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
</pre>
- <li> Build and install exactly the same as you did for the desktop
- (note that the generated Makefile is different):
+ <li> Rebuild the makefile ($TMAKEPATH has changed) above:
<pre>
@@ -148,9 +147,25 @@ on the desktop, the process is similar:
tmake -o Makefile example.pro
- ... <i>etc.</i>
</pre>
- <li> To install it on a device, build an ipk package file (you should be root
- to do this, since then it will strip the executable for you):
+ <li> Build it:
<pre>
+ make
+</pre>
+
+ <li> Install it (note that this is now going into the /opt/Qtopia/sharp/ directory):
+<pre>
+ su # root privileges required to install
+ cp example.desktop $QPEDIR/apps/Applications
+ cp Example.png $QPEDIR/pics
+ cp example $QPEDIR/bin
+ exit # no need to be root anymore
+</pre>
+
+</pre>
+
+ <li> To install it on a device, build an ipk package file:
+<pre>
+ su # root privileges required to strip the executable
mkipks example.control
+ exit # no need to be root anymore
</pre>
diff --git a/library/Makefile.in b/library/Makefile.in
index b74b818..b8fc1f6 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -33,3 +33,2 @@ HEADERS = calendar.h \
networkinterface.h \
- proxies.h \
filemanager.h \
@@ -39,2 +38,3 @@ HEADERS = calendar.h \
fileselector.h \
+ fileselector_p.h \
imageedit.h \
@@ -80,8 +80,3 @@ HEADERS = calendar.h \
finddialog.h \
- lnkproperties.h \
- quuid.h \
- qcom.h \
- qlibrary.h \
- qlibrary_p.h \
- qprocess.h
+ lnkproperties.h
SOURCES = calendar.cpp \
@@ -93,3 +88,2 @@ SOURCES = calendar.cpp \
networkinterface.cpp \
- proxies.cpp \
filemanager.cpp \
@@ -141,8 +135,3 @@ SOURCES = calendar.cpp \
finddialog.cpp \
- lnkproperties.cpp \
- quuid.cpp \
- qlibrary.cpp \
- qlibrary_unix.cpp \
- qprocess.cpp \
- qprocess_unix.cpp
+ lnkproperties.cpp
OBJECTS = calendar.o \
@@ -154,3 +143,2 @@ OBJECTS = calendar.o \
networkinterface.o \
- proxies.o \
filemanager.o \
@@ -203,9 +191,3 @@ OBJECTS = calendar.o \
lnkproperties.o \
- quuid.o \
- qlibrary.o \
- qlibrary_unix.o \
- qprocess.o \
- qprocess_unix.o \
passwordbase_p.o \
- proxiesbase_p.o \
categoryeditbase_p.o \
@@ -214,3 +196,2 @@ OBJECTS = calendar.o \
INTERFACES = passwordbase_p.ui \
- proxiesbase_p.ui \
categoryeditbase_p.ui \
@@ -219,3 +200,2 @@ INTERFACES = passwordbase_p.ui \
UICDECLS = passwordbase_p.h \
- proxiesbase_p.h \
categoryeditbase_p.h \
@@ -224,3 +204,2 @@ UICDECLS = passwordbase_p.h \
UICIMPLS = passwordbase_p.cpp \
- proxiesbase_p.cpp \
categoryeditbase_p.cpp \
@@ -229,5 +208,5 @@ UICIMPLS = passwordbase_p.cpp \
SRCMOC = moc_menubutton.cpp \
- moc_proxies.cpp \
moc_datebookmonth.cpp \
moc_fileselector.cpp \
+ moc_fileselector_p.cpp \
moc_imageedit.cpp \
@@ -249,4 +228,2 @@ SRCMOC = moc_menubutton.cpp \
moc_lnkproperties.cpp \
- moc_qlibrary_p.cpp \
- moc_qprocess.cpp \
global.moc \
@@ -256,5 +233,3 @@ SRCMOC = moc_menubutton.cpp \
timestring.moc \
- qprocess_unix.moc \
moc_passwordbase_p.cpp \
- moc_proxiesbase_p.cpp \
moc_categoryeditbase_p.cpp \
@@ -263,5 +238,5 @@ SRCMOC = moc_menubutton.cpp \
OBJMOC = moc_menubutton.o \
- moc_proxies.o \
moc_datebookmonth.o \
moc_fileselector.o \
+ moc_fileselector_p.o \
moc_imageedit.o \
@@ -283,6 +258,3 @@ OBJMOC = moc_menubutton.o \
moc_lnkproperties.o \
- moc_qlibrary_p.o \
- moc_qprocess.o \
moc_passwordbase_p.o \
- moc_proxiesbase_p.o \
moc_categoryeditbase_p.o \
@@ -321,4 +293,6 @@ moc: $(SRCMOC)
-tmake:
- tmake library.pro
+tmake: Makefile.in
+
+Makefile.in: library.pro
+ tmake library.pro -o Makefile.in
@@ -383,7 +357,2 @@ networkinterface.o: networkinterface.cpp \
-proxies.o: proxies.cpp \
- proxies.h \
- config.h \
- proxiesbase_p.h
-
filemanager.o: filemanager.cpp \
@@ -412,2 +381,3 @@ fileselector.o: fileselector.cpp \
applnk.h \
+ fileselector_p.h \
global.h \
@@ -536,4 +506,3 @@ fontdatabase.o: fontdatabase.cpp \
power.o: power.cpp \
- power.h \
- custom.h
+ power.h
@@ -635,21 +604,2 @@ lnkproperties.o: lnkproperties.cpp \
-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
@@ -660,8 +610,2 @@ passwordbase_p.cpp: passwordbase_p.ui
-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
@@ -686,4 +630,2 @@ passwordbase_p.o: passwordbase_p.cpp
-proxiesbase_p.o: proxiesbase_p.cpp
-
categoryeditbase_p.o: categoryeditbase_p.cpp
@@ -697,6 +639,2 @@ moc_menubutton.o: moc_menubutton.cpp \
-moc_proxies.o: moc_proxies.cpp \
- proxies.h \
- config.h
-
moc_datebookmonth.o: moc_datebookmonth.cpp \
@@ -711,2 +649,5 @@ moc_fileselector.o: moc_fileselector.cpp \
+moc_fileselector_p.o: moc_fileselector_p.cpp \
+ fileselector_p.h
+
moc_imageedit.o: moc_imageedit.cpp \
@@ -768,9 +709,2 @@ moc_lnkproperties.o: moc_lnkproperties.cpp \
-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 \
@@ -778,6 +712,6 @@ moc_passwordbase_p.o: global.moc \
-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 \
@@ -789,3 +723,3 @@ moc_categoryeditbase_p.o: password.moc \
-moc_findwidgetbase_p.o: process_unix.moc \
+moc_lnkpropertiesbase_p.o: process_unix.moc \
process_unix.cpp \
@@ -793,9 +727,2 @@ moc_findwidgetbase_p.o: process_unix.moc \
-moc_lnkpropertiesbase_p.o: timestring.moc \
- timestring.cpp \
- timestring.h \
- qpeapplication.h \
- qpedecoration_qws.h \
- config.h
-
moc_menubutton.cpp: menubutton.h
@@ -803,5 +730,2 @@ moc_menubutton.cpp: menubutton.h
-moc_proxies.cpp: proxies.h
- $(MOC) proxies.h -o moc_proxies.cpp
-
moc_datebookmonth.cpp: datebookmonth.h
@@ -812,2 +736,5 @@ moc_fileselector.cpp: fileselector.h
+moc_fileselector_p.cpp: fileselector_p.h
+ $(MOC) fileselector_p.h -o moc_fileselector_p.cpp
+
moc_imageedit.cpp: imageedit.h
@@ -863,8 +790,2 @@ moc_lnkproperties.cpp: lnkproperties.h
-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
@@ -884,5 +805,2 @@ timestring.moc: timestring.cpp
-qprocess_unix.moc: qprocess_unix.cpp
- $(MOC) qprocess_unix.cpp -o qprocess_unix.moc
-
moc_passwordbase_p.cpp: passwordbase_p.h
@@ -890,5 +808,2 @@ moc_passwordbase_p.cpp: passwordbase_p.h
-moc_proxiesbase_p.cpp: proxiesbase_p.h
- $(MOC) proxiesbase_p.h -o moc_proxiesbase_p.cpp
-
moc_categoryeditbase_p.cpp: categoryeditbase_p.h
diff --git a/library/global.cpp b/library/global.cpp
index e5fc2b3..fd7579a 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -507,3 +507,3 @@ void Global::invoke(const QString &c)
::execvp( args[0], (char * const *)args );
- exit( -1 );
+ _exit( -1 );
}
diff --git a/library/library.pro b/library/library.pro
index 058d216..e71e5a0 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -10,3 +10,2 @@ HEADERS = calendar.h \
networkinterface.h \
- proxies.h \
filemanager.h \
@@ -16,2 +15,3 @@ HEADERS = calendar.h \
fileselector.h \
+ fileselector_p.h \
imageedit.h \
@@ -66,3 +66,2 @@ SOURCES = calendar.cpp \
networkinterface.cpp \
- proxies.cpp \
filemanager.cpp \
@@ -117,5 +116,4 @@ SOURCES = calendar.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
@@ -124,3 +122,3 @@ 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
diff --git a/noncore/games/chess/Makefile.in b/noncore/games/chess/Makefile.in
index 7354d76..a1f2cd7 100644
--- a/noncore/games/chess/Makefile.in
+++ b/noncore/games/chess/Makefile.in
@@ -5,6 +5,6 @@
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
-CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DQCONFIG=\"qpe\"
+CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
-CFLAGS = $(SYSCONF_CFLAGS) -DQCONFIG=\"qpe\"
-INCPATH = -I$(QPEDIR)/include
+CFLAGS = $(SYSCONF_CFLAGS)
+INCPATH = -I$(OPIEDIR)/include
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -69,4 +69,6 @@ moc: $(SRCMOC)
-tmake:
- tmake chess.pro
+tmake: Makefile.in
+
+Makefile.in: chess.pro
+ tmake chess.pro -o Makefile.in
@@ -104,4 +106,2 @@ REQUIRES=
chess.o: chess.cpp \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/resource.h \
chess.h
@@ -109,3 +109,3 @@ chess.o: chess.cpp \
main.o: main.cpp \
- mainwindow.h
+ chess.h
diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in
index 985eff0..0395dff 100644
--- a/noncore/games/go/Makefile.in
+++ b/noncore/games/go/Makefile.in
@@ -77,4 +77,6 @@ moc: $(SRCMOC)
-tmake:
- tmake go.pro
+tmake: Makefile.in
+
+Makefile.in: go.pro
+ tmake go.pro -o Makefile.in
@@ -135,7 +137,3 @@ gowidget.o: gowidget.cpp \
go.h \
- goplayutils.h \
- $(OPIEDIR)/include/qpe/config.h \
- $(OPIEDIR)/include/qpe/resource.h \
- $(OPIEDIR)/include/qpe/qpetoolbar.h \
- $(OPIEDIR)/include/qpe/qpemenubar.h
+ goplayutils.h
@@ -145,4 +143,3 @@ main.o: main.cpp \
go.h \
- goplayutils.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h
+ goplayutils.h