author | tille <tille> | 2003-08-25 12:56:53 (UTC) |
---|---|---|
committer | tille <tille> | 2003-08-25 12:56:53 (UTC) |
commit | c817abf3b81ca47927433ede1efd9afddfc15a72 (patch) (side-by-side diff) | |
tree | 3e5727ad9bd9b54475f04d2be33bb8db6e26636f /libopie2 | |
parent | ff72e85696d070efa03975ea8130807579a6e1d9 (diff) | |
download | opie-c817abf3b81ca47927433ede1efd9afddfc15a72.zip opie-c817abf3b81ca47927433ede1efd9afddfc15a72.tar.gz opie-c817abf3b81ca47927433ede1efd9afddfc15a72.tar.bz2 |
libopie2 compiles for qt3/x11 now
run:
qmake "platform=x11" libopie2.pro
-rw-r--r-- | libopie2/README | 19 | ||||
-rw-r--r-- | libopie2/libopie2.pro | 7 | ||||
-rw-r--r-- | libopie2/opiecore/oapplication.cpp | 12 | ||||
-rw-r--r-- | libopie2/opiecore/oapplication.h | 8 | ||||
-rw-r--r-- | libopie2/opiecore/opiecore.pro | 9 | ||||
-rw-r--r-- | libopie2/opiedb/opiedb.pro | 6 | ||||
-rw-r--r-- | libopie2/opiedb/osqlmanager.h | 2 | ||||
-rw-r--r-- | libopie2/opiemm/opiemm.pro | 6 | ||||
-rw-r--r-- | libopie2/opiemm/osoundsystem.cpp | 1 | ||||
-rw-r--r-- | libopie2/opienet/opienet.pro | 6 | ||||
-rw-r--r-- | libopie2/opiepim/opiepim.pro | 7 | ||||
-rw-r--r-- | libopie2/opieui/opieui.pro | 18 | ||||
-rw-r--r-- | libopie2/opieui/oversatileview.h | 2 |
13 files changed, 97 insertions, 6 deletions
diff --git a/libopie2/README b/libopie2/README index 57172a7..daf6b27 100644 --- a/libopie2/README +++ b/libopie2/README @@ -13,2 +13,21 @@ -------------------------------------------------------- +0. Building +-------------------------------------------------------- + +* for QPE run: + qmake libopie2.pro + make + +OR (even better) + cd $OPIEDIR + make menuconfig + make -k + +* for QT/X11 run: + qmake "platform=x11" libopie2.pro + make + +Make sure you have set $PLATFORM=x86-linux + +-------------------------------------------------------- 1. General Overview diff --git a/libopie2/libopie2.pro b/libopie2/libopie2.pro index 0bd1d06..e734654 100644 --- a/libopie2/libopie2.pro +++ b/libopie2/libopie2.pro @@ -3,2 +3,9 @@ unix:SUBDIRS = opiecore opiedb opiepim opieui opienet opiemm examples +!contains( platform, x11 ) { + message( Configuring libopie2 for build on Opie ) include ( $(OPIEDIR)/include.pro ) +} + +contains( platform, x11 ) { + message( Configuring libopie2 for build on Qt/X11 ) +} diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp index 06d8ba2..84cab48 100644 --- a/libopie2/opiecore/oapplication.cpp +++ b/libopie2/opiecore/oapplication.cpp @@ -32,2 +32,3 @@ #include <opie2/oconfig.h> +#include <opie2/odebug.h> @@ -55,3 +56,7 @@ class OApplicationPrivate OApplication::OApplication( int& argc, char** argv, const QCString& rAppName ) +#ifdef QWS :QPEApplication( argc, argv ), +#else + :QApplication( argc, argv ), +#endif _appname( rAppName ), @@ -109,3 +114,10 @@ void OApplication::showMainWidget( QWidget* widget, bool nomax ) { +#ifdef QWS QPEApplication::showMainWidget( widget, nomax ); +#else +// tille: I am quit sure if this is the right way to do.. + odDebug(nomax,7) << "ignoring nomax"; + setMainWidget( widget ); + widget->show(); +#endif widget->setCaption( _appname ); diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h index 6bc2b1c..3043910 100644 --- a/libopie2/opiecore/oapplication.h +++ b/libopie2/opiecore/oapplication.h @@ -35,3 +35,7 @@ +#ifdef QWS #include <qpe/qpeapplication.h> +#else +#include <qapplication.h> +#endif @@ -40,3 +44,7 @@ class OConfig; +#ifdef QWS class OApplication: public QPEApplication +#else +class OApplication : public QApplication +#endif { diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro index ed7d6d7..c8a291a 100644 --- a/libopie2/opiecore/opiecore.pro +++ b/libopie2/opiecore/opiecore.pro @@ -25,3 +25,2 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS = -lqpe MOC_DIR = moc @@ -29,3 +28,11 @@ OBJECTS_DIR = obj + +!contains( platform, x11 ) { + LIBS = -lqpe include ( $(OPIEDIR)/include.pro ) +} + +contains( platform, x11 ) { + LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib +} diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro index 401646a..3612f0e 100644 --- a/libopie2/opiedb/opiedb.pro +++ b/libopie2/opiedb/opiedb.pro @@ -30,3 +30,9 @@ OBJECTS_DIR = obj +!contains( platform, x11 ) { include ( $(OPIEDIR)/include.pro ) +} + +contains( platform, x11 ) { + LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib +} diff --git a/libopie2/opiedb/osqlmanager.h b/libopie2/opiedb/osqlmanager.h index b3d8d69..5323b14 100644 --- a/libopie2/opiedb/osqlmanager.h +++ b/libopie2/opiedb/osqlmanager.h @@ -5,2 +5,3 @@ #include <qobject.h> +#include <qstringlist.h> @@ -8,2 +9,3 @@ + /** diff --git a/libopie2/opiemm/opiemm.pro b/libopie2/opiemm/opiemm.pro index 8e5eeb4..d3ce8f7 100644 --- a/libopie2/opiemm/opiemm.pro +++ b/libopie2/opiemm/opiemm.pro @@ -14,3 +14,9 @@ OBJECTS_DIR = obj + +!contains( platform, x11 ) { include ( $(OPIEDIR)/include.pro ) +} +contains( platform, x11 ) { + LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib +} diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp index fd23bea..d857659 100644 --- a/libopie2/opiemm/osoundsystem.cpp +++ b/libopie2/opiemm/osoundsystem.cpp @@ -41,2 +41,3 @@ +#include <qstringlist.h> diff --git a/libopie2/opienet/opienet.pro b/libopie2/opienet/opienet.pro index 3f9166a..93389db 100644 --- a/libopie2/opienet/opienet.pro +++ b/libopie2/opienet/opienet.pro @@ -20,3 +20,9 @@ OBJECTS_DIR = obj + +!contains( platform, x11 ) { include ( $(OPIEDIR)/include.pro ) +} +contains( platform, x11 ) { + LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib +} diff --git a/libopie2/opiepim/opiepim.pro b/libopie2/opiepim/opiepim.pro index 7fc7bb7..cc6ee90 100644 --- a/libopie2/opiepim/opiepim.pro +++ b/libopie2/opiepim/opiepim.pro @@ -15,3 +15,10 @@ OBJECTS_DIR = obj + +!contains( platform, x11 ) { include ( $(OPIEDIR)/include.pro ) +} + +contains( platform, x11 ) { + LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib +} diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro index aa85955..1b6ecdf 100644 --- a/libopie2/opieui/opieui.pro +++ b/libopie2/opieui/opieui.pro @@ -17,4 +17,4 @@ HEADERS = ocompletionbox.h \ odialog.h \ - oseparator.h \ - otaskbarapplet.h + oseparator.h +# otaskbarapplet.h @@ -34,4 +34,4 @@ SOURCES = ocompletionbox.cpp \ odialog.cpp \ - oseparator.cpp \ - otaskbarapplet.cpp + oseparator.cpp #\ +# otaskbarapplet.cpp @@ -46,3 +46,13 @@ OBJECTS_DIR = obj + +!contains( platform, x11 ) { include ( $(OPIEDIR)/include.pro ) + HEADERS += otaskbarapplet.h + SOURCES += otaskbarapplet.cpp +} + +contains( platform, x11 ) { + LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib + message( Warning: NO otaskbarapplet ATM ) +} diff --git a/libopie2/opieui/oversatileview.h b/libopie2/opieui/oversatileview.h index 1df8154..8af21dc 100644 --- a/libopie2/opieui/oversatileview.h +++ b/libopie2/opieui/oversatileview.h @@ -40,3 +40,3 @@ -#include <qpe/qpeapplication.h> +#include <opie2/oapplication.h> |