summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/README19
-rw-r--r--libopie2/libopie2.pro9
-rw-r--r--libopie2/opiecore/oapplication.cpp12
-rw-r--r--libopie2/opiecore/oapplication.h10
-rw-r--r--libopie2/opiecore/opiecore.pro11
-rw-r--r--libopie2/opiedb/opiedb.pro8
-rw-r--r--libopie2/opiedb/osqlmanager.h2
-rw-r--r--libopie2/opiemm/opiemm.pro8
-rw-r--r--libopie2/opiemm/osoundsystem.cpp1
-rw-r--r--libopie2/opienet/opienet.pro8
-rw-r--r--libopie2/opiepim/opiepim.pro9
-rw-r--r--libopie2/opieui/opieui.pro20
-rw-r--r--libopie2/opieui/oversatileview.h2
13 files changed, 105 insertions, 14 deletions
diff --git a/libopie2/README b/libopie2/README
index 57172a7..daf6b27 100644
--- a/libopie2/README
+++ b/libopie2/README
@@ -12,4 +12,23 @@
--------------------------------------------------------
+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
@@ -2,3 +2,10 @@ TEMPLATE = subdirs
unix:SUBDIRS = opiecore opiedb opiepim opieui opienet opiemm examples
-include ( $(OPIEDIR)/include.pro )
+!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
@@ -31,4 +31,5 @@
#include <opie2/oapplication.h>
#include <opie2/oconfig.h>
+#include <opie2/odebug.h>
#include <signal.h>
@@ -54,5 +55,9 @@ class OApplicationPrivate
OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
+#ifdef QWS
:QPEApplication( argc, argv ),
+#else
+ :QApplication( argc, argv ),
+#endif
_appname( rAppName ),
_config( 0 )
@@ -108,5 +113,12 @@ void OApplication::init()
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
@@ -34,10 +34,18 @@
#define oApp OApplication::oApplication()
+#ifdef QWS
#include <qpe/qpeapplication.h>
+#else
+#include <qapplication.h>
+#endif
class OApplicationPrivate;
class OConfig;
-class OApplication: public QPEApplication
+#ifdef QWS
+class OApplication : public QPEApplication
+#else
+class OApplication : public QApplication
+#endif
{
Q_OBJECT
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
@@ -24,8 +24,15 @@ VERSION = 1.8.1
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS = -lqpe
MOC_DIR = moc
OBJECTS_DIR = obj
-include ( $(OPIEDIR)/include.pro )
+
+!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
@@ -29,4 +29,10 @@ MOC_DIR = moc
OBJECTS_DIR = obj
-include ( $(OPIEDIR)/include.pro )
+!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
@@ -4,7 +4,9 @@
#include <qobject.h>
+#include <qstringlist.h>
#include "osqlbackend.h"
+
/**
* OSQLManager is responsible for loading
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
@@ -13,4 +13,10 @@ MOC_DIR = moc
OBJECTS_DIR = obj
-include ( $(OPIEDIR)/include.pro )
+!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
@@ -40,4 +40,5 @@
#include <sys/stat.h>
+#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
@@ -19,4 +19,10 @@ MOC_DIR = moc
OBJECTS_DIR = obj
-include ( $(OPIEDIR)/include.pro )
+!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
@@ -14,4 +14,11 @@ MOC_DIR = moc
OBJECTS_DIR = obj
-include ( $(OPIEDIR)/include.pro )
+
+!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
@@ -16,6 +16,6 @@ HEADERS = ocompletionbox.h \
#ojanuswidget.h \
odialog.h \
- oseparator.h \
- otaskbarapplet.h
+ oseparator.h
+# otaskbarapplet.h
SOURCES = ocompletionbox.cpp \
@@ -33,6 +33,6 @@ SOURCES = ocompletionbox.cpp \
#ojanuswidget.cpp \
odialog.cpp \
- oseparator.cpp \
- otaskbarapplet.cpp
+ oseparator.cpp #\
+# otaskbarapplet.cpp
INTERFACES =
@@ -45,4 +45,14 @@ MOC_DIR = moc
OBJECTS_DIR = obj
-include ( $(OPIEDIR)/include.pro )
+
+!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
@@ -39,5 +39,5 @@
/* OPIE */
-#include <qpe/qpeapplication.h>
+#include <opie2/oapplication.h>
/* FORWARDS */