summaryrefslogtreecommitdiff
Unidiff
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
@@ -11,6 +11,25 @@
11 * reduce possible bugs through reusing tested code 11 * reduce possible bugs through reusing tested code
12 12
13-------------------------------------------------------- 13--------------------------------------------------------
140. Building
15--------------------------------------------------------
16
17* for QPE run:
18 qmake libopie2.pro
19 make
20
21OR (even better)
22 cd $OPIEDIR
23 make menuconfig
24 make -k
25
26* for QT/X11 run:
27 qmake "platform=x11" libopie2.pro
28 make
29
30Make sure you have set $PLATFORM=x86-linux
31
32--------------------------------------------------------
141. General Overview 331. General Overview
15-------------------------------------------------------- 34--------------------------------------------------------
16 35
diff --git a/libopie2/libopie2.pro b/libopie2/libopie2.pro
index 0bd1d06..e734654 100644
--- a/libopie2/libopie2.pro
+++ b/libopie2/libopie2.pro
@@ -1,4 +1,11 @@
1TEMPLATE = subdirs 1TEMPLATE = subdirs
2unix:SUBDIRS = opiecore opiedb opiepim opieui opienet opiemm examples 2unix:SUBDIRS = opiecore opiedb opiepim opieui opienet opiemm examples
3 3
4include ( $(OPIEDIR)/include.pro ) 4!contains( platform, x11 ) {
5 message( Configuring libopie2 for build on Opie )
6 include ( $(OPIEDIR)/include.pro )
7}
8
9contains( platform, x11 ) {
10 message( Configuring libopie2 for build on Qt/X11 )
11}
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
@@ -30,6 +30,7 @@
30 30
31#include <opie2/oapplication.h> 31#include <opie2/oapplication.h>
32#include <opie2/oconfig.h> 32#include <opie2/oconfig.h>
33#include <opie2/odebug.h>
33 34
34#include <signal.h> 35#include <signal.h>
35#include <stdio.h> 36#include <stdio.h>
@@ -53,7 +54,11 @@ class OApplicationPrivate
53 54
54 55
55OApplication::OApplication( int& argc, char** argv, const QCString& rAppName ) 56OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
57#ifdef QWS
56 :QPEApplication( argc, argv ), 58 :QPEApplication( argc, argv ),
59#else
60 :QApplication( argc, argv ),
61#endif
57 _appname( rAppName ), 62 _appname( rAppName ),
58 _config( 0 ) 63 _config( 0 )
59{ 64{
@@ -107,7 +112,14 @@ void OApplication::init()
107 112
108void OApplication::showMainWidget( QWidget* widget, bool nomax ) 113void OApplication::showMainWidget( QWidget* widget, bool nomax )
109{ 114{
115#ifdef QWS
110 QPEApplication::showMainWidget( widget, nomax ); 116 QPEApplication::showMainWidget( widget, nomax );
117#else
118// tille: I am quit sure if this is the right way to do..
119 odDebug(nomax,7) << "ignoring nomax";
120 setMainWidget( widget );
121 widget->show();
122#endif
111 widget->setCaption( _appname ); 123 widget->setCaption( _appname );
112} 124}
113 125
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
@@ -33,12 +33,20 @@
33 33
34#define oApp OApplication::oApplication() 34#define oApp OApplication::oApplication()
35 35
36#ifdef QWS
36#include <qpe/qpeapplication.h> 37#include <qpe/qpeapplication.h>
38#else
39#include <qapplication.h>
40#endif
37 41
38class OApplicationPrivate; 42class OApplicationPrivate;
39class OConfig; 43class OConfig;
40 44
41class OApplication: public QPEApplication 45#ifdef QWS
46class OApplication : public QPEApplication
47#else
48class OApplication : public QApplication
49#endif
42{ 50{
43 Q_OBJECT 51 Q_OBJECT
44 52
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
@@ -23,9 +23,16 @@ TARGET = opiecore2
23VERSION = 1.8.1 23VERSION = 1.8.1
24INCLUDEPATH += $(OPIEDIR)/include 24INCLUDEPATH += $(OPIEDIR)/include
25DEPENDPATH += $(OPIEDIR)/include 25DEPENDPATH += $(OPIEDIR)/include
26LIBS = -lqpe
27MOC_DIR = moc 26MOC_DIR = moc
28OBJECTS_DIR = obj 27OBJECTS_DIR = obj
29 28
30include ( $(OPIEDIR)/include.pro ) 29
30!contains( platform, x11 ) {
31 LIBS = -lqpe
32 include ( $(OPIEDIR)/include.pro )
33}
34
35contains( platform, x11 ) {
36 LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
37}
31 38
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
@@ -28,5 +28,11 @@ DEPENDPATH += $(OPIEDIR)/include
28MOC_DIR = moc 28MOC_DIR = moc
29OBJECTS_DIR = obj 29OBJECTS_DIR = obj
30 30
31include ( $(OPIEDIR)/include.pro ) 31!contains( platform, x11 ) {
32 include ( $(OPIEDIR)/include.pro )
33}
34
35contains( platform, x11 ) {
36 LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
37}
32 38
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
@@ -3,9 +3,11 @@
3#define OSQL_MANAGER_H 3#define OSQL_MANAGER_H
4 4
5#include <qobject.h> 5#include <qobject.h>
6#include <qstringlist.h>
6 7
7#include "osqlbackend.h" 8#include "osqlbackend.h"
8 9
10
9/** 11/**
10 * OSQLManager is responsible for loading 12 * OSQLManager is responsible for loading
11 * and unloading, querying different OSQL 13 * and unloading, querying different OSQL
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
@@ -12,5 +12,11 @@ LIBS +=
12MOC_DIR = moc 12MOC_DIR = moc
13OBJECTS_DIR = obj 13OBJECTS_DIR = obj
14 14
15include ( $(OPIEDIR)/include.pro )
16 15
16!contains( platform, x11 ) {
17 include ( $(OPIEDIR)/include.pro )
18}
19
20contains( platform, x11 ) {
21 LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
22}
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
@@ -39,6 +39,7 @@
39#include <sys/soundcard.h> 39#include <sys/soundcard.h>
40#include <sys/stat.h> 40#include <sys/stat.h>
41 41
42#include <qstringlist.h>
42 43
43/*====================================================================================== 44/*======================================================================================
44 * OSoundSystem 45 * OSoundSystem
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
@@ -18,5 +18,11 @@ LIBS += -lpcap
18MOC_DIR = moc 18MOC_DIR = moc
19OBJECTS_DIR = obj 19OBJECTS_DIR = obj
20 20
21include ( $(OPIEDIR)/include.pro )
22 21
22!contains( platform, x11 ) {
23 include ( $(OPIEDIR)/include.pro )
24}
25
26contains( platform, x11 ) {
27 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
28}
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
@@ -13,5 +13,12 @@ DEPENDPATH += $(OPIEDIR)/include
13MOC_DIR = moc 13MOC_DIR = moc
14OBJECTS_DIR = obj 14OBJECTS_DIR = obj
15 15
16include ( $(OPIEDIR)/include.pro ) 16
17!contains( platform, x11 ) {
18 include ( $(OPIEDIR)/include.pro )
19}
20
21contains( platform, x11 ) {
22 LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
23}
17 24
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
@@ -15,8 +15,8 @@ HEADERS = ocompletionbox.h \
15 oversatileviewitem.h \ 15 oversatileviewitem.h \
16 #ojanuswidget.h \ 16 #ojanuswidget.h \
17 odialog.h \ 17 odialog.h \
18 oseparator.h \ 18 oseparator.h
19 otaskbarapplet.h 19# otaskbarapplet.h
20 20
21SOURCES = ocompletionbox.cpp \ 21SOURCES = ocompletionbox.cpp \
22 ocombobox.cpp \ 22 ocombobox.cpp \
@@ -32,8 +32,8 @@ SOURCES = ocompletionbox.cpp \
32 oversatileviewitem.cpp \ 32 oversatileviewitem.cpp \
33 #ojanuswidget.cpp \ 33 #ojanuswidget.cpp \
34 odialog.cpp \ 34 odialog.cpp \
35 oseparator.cpp \ 35 oseparator.cpp #\
36 otaskbarapplet.cpp 36# otaskbarapplet.cpp
37 37
38INTERFACES = 38INTERFACES =
39TARGET = opieui2 39TARGET = opieui2
@@ -44,5 +44,15 @@ LIBS += -lopiecore2
44MOC_DIR = moc 44MOC_DIR = moc
45OBJECTS_DIR = obj 45OBJECTS_DIR = obj
46 46
47include ( $(OPIEDIR)/include.pro ) 47
48!contains( platform, x11 ) {
49 include ( $(OPIEDIR)/include.pro )
50 HEADERS += otaskbarapplet.h
51 SOURCES += otaskbarapplet.cpp
52}
53
54contains( platform, x11 ) {
55 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
56 message( Warning: NO otaskbarapplet ATM )
57}
48 58
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
@@ -38,7 +38,7 @@
38 38
39/* OPIE */ 39/* OPIE */
40 40
41#include <qpe/qpeapplication.h> 41#include <opie2/oapplication.h>
42 42
43/* FORWARDS */ 43/* FORWARDS */
44 44