summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/README19
-rw-r--r--libopie2/libopie2.pro7
-rw-r--r--libopie2/opiecore/oapplication.cpp12
-rw-r--r--libopie2/opiecore/oapplication.h8
-rw-r--r--libopie2/opiecore/opiecore.pro9
-rw-r--r--libopie2/opiedb/opiedb.pro6
-rw-r--r--libopie2/opiedb/osqlmanager.h2
-rw-r--r--libopie2/opiemm/opiemm.pro6
-rw-r--r--libopie2/opiemm/osoundsystem.cpp1
-rw-r--r--libopie2/opienet/opienet.pro6
-rw-r--r--libopie2/opiepim/opiepim.pro7
-rw-r--r--libopie2/opieui/opieui.pro18
-rw-r--r--libopie2/opieui/oversatileview.h2
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
@@ -6,16 +6,35 @@
* optimize Qt classes for the embedded environment
* provide sophisticated abstractions for developers
* provide complete documentation and working examples
* provide end users with a common look and feel
* reduce memory footprint through sharing code
* reduce possible bugs through reusing tested code
--------------------------------------------------------
+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
--------------------------------------------------------
libopie is functionally seperated into the following libraries:
- libopiecore
- libopieui
- libopiepim
- libopiedb
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 @@
TEMPLATE = subdirs
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
@@ -25,16 +25,17 @@
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include <opie2/oapplication.h>
#include <opie2/oconfig.h>
+#include <opie2/odebug.h>
#include <signal.h>
#include <stdio.h>
OApplication* OApplication::_instance = 0;
/**************************************************************************************************/
/* OApplicationPrivate
@@ -48,17 +49,21 @@ class OApplicationPrivate
};
/**************************************************************************************************/
/* OApplication
/**************************************************************************************************/
OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
+#ifdef QWS
:QPEApplication( argc, argv ),
+#else
+ :QApplication( argc, argv ),
+#endif
_appname( rAppName ),
_config( 0 )
{
init();
}
OApplication::~OApplication()
@@ -102,17 +107,24 @@ void OApplication::init()
{
qFatal( "OApplication: Can't create more than one OApplication object. Aborting." );
}
}
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 );
}
void OApplication::setTitle( const QString& title ) const
{
if ( mainWidget() )
{
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
@@ -28,22 +28,30 @@
Boston, MA 02111-1307, USA.
*/
#ifndef OAPPLICATION_H
#define OAPPLICATION_H
#define oApp OApplication::oApplication()
+#ifdef QWS
#include <qpe/qpeapplication.h>
+#else
+#include <qapplication.h>
+#endif
class OApplicationPrivate;
class OConfig;
+#ifdef QWS
class OApplication: public QPEApplication
+#else
+class OApplication : public QApplication
+#endif
{
Q_OBJECT
public:
/**
* Constructor. Parses command-line arguments and sets the window caption.
*
* @param rAppName application name. Will be used for finding the
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
@@ -18,14 +18,21 @@ SOURCES = oapplication.cpp \
oglobal.cpp \
oglobalsettings.cpp
INTERFACES =
TARGET = opiecore2
VERSION = 1.8.1
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS = -lqpe
MOC_DIR = moc
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
@@ -23,10 +23,16 @@ INTERFACES =
TARGET = opiedb2
VERSION = 1.8.1
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
MOC_DIR = moc
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
@@ -1,16 +1,18 @@
#ifndef OSQL_MANAGER_H
#define OSQL_MANAGER_H
#include <qobject.h>
+#include <qstringlist.h>
#include "osqlbackend.h"
+
/**
* OSQLManager is responsible for loading
* and unloading, querying different OSQL
* services
* Load a OSQLDriver and delete it yourself
*
*/
class OSQLDriver;
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
@@ -7,10 +7,16 @@ INTERFACES =
TARGET = opiemm2
VERSION = 1.8.1
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS +=
MOC_DIR = moc
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
@@ -34,16 +34,17 @@
#include <errno.h>
#include <fcntl.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/soundcard.h>
#include <sys/stat.h>
+#include <qstringlist.h>
/*======================================================================================
* OSoundSystem
*======================================================================================*/
OSoundSystem* OSoundSystem::_instance = 0;
OSoundSystem::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
@@ -13,10 +13,16 @@ INTERFACES =
TARGET = opienet2
VERSION = 1.8.1
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lpcap
MOC_DIR = moc
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
@@ -8,10 +8,17 @@ INTERFACES =
TARGET = opiepim2
VERSION = 1.8.1
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
MOC_DIR = moc
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
@@ -10,39 +10,49 @@ HEADERS = ocompletionbox.h \
opixmapeffect.h \
opopupmenu.h \
opixmapprovider.h \
oselector.h \
oversatileview.h \
oversatileviewitem.h \
#ojanuswidget.h \
odialog.h \
- oseparator.h \
- otaskbarapplet.h
+ oseparator.h
+# otaskbarapplet.h
SOURCES = ocompletionbox.cpp \
ocombobox.cpp \
oeditlistbox.cpp \
olineedit.cpp \
olistview.cpp \
oimageeffect.cpp \
opixmapeffect.cpp \
opopupmenu.cpp \
opixmapprovider.cpp \
oselector.cpp \
oversatileview.cpp \
oversatileviewitem.cpp \
#ojanuswidget.cpp \
odialog.cpp \
- oseparator.cpp \
- otaskbarapplet.cpp
+ oseparator.cpp #\
+# otaskbarapplet.cpp
INTERFACES =
TARGET = opieui2
VERSION = 1.8.1
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lopiecore2
MOC_DIR = moc
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
@@ -33,17 +33,17 @@
/* QT */
#include <qwidgetstack.h>
#include <qiconview.h>
/* OPIE */
-#include <qpe/qpeapplication.h>
+#include <opie2/oapplication.h>
/* FORWARDS */
class QHeader;
class QIconSet;
class QIconViewItem;
class OListView;
class QListViewItem;