author | tille <tille> | 2003-08-25 12:56:53 (UTC) |
---|---|---|
committer | tille <tille> | 2003-08-25 12:56:53 (UTC) |
commit | c817abf3b81ca47927433ede1efd9afddfc15a72 (patch) (unidiff) | |
tree | 3e5727ad9bd9b54475f04d2be33bb8db6e26636f /libopie2/opiedb | |
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/opiedb/opiedb.pro | 8 | ||||
-rw-r--r-- | libopie2/opiedb/osqlmanager.h | 2 |
2 files changed, 9 insertions, 1 deletions
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 | |||
@@ -15,18 +15,24 @@ SOURCES = osqlbackend.cpp \ | |||
15 | osqlerror.cpp \ | 15 | osqlerror.cpp \ |
16 | osqlmanager.cpp \ | 16 | osqlmanager.cpp \ |
17 | osqlquery.cpp \ | 17 | osqlquery.cpp \ |
18 | osqlresult.cpp \ | 18 | osqlresult.cpp \ |
19 | osqltable.cpp \ | 19 | osqltable.cpp \ |
20 | osqlbackendmanager.cpp \ | 20 | osqlbackendmanager.cpp \ |
21 | osqlitedriver.cpp | 21 | osqlitedriver.cpp |
22 | INTERFACES = | 22 | INTERFACES = |
23 | TARGET = opiedb2 | 23 | TARGET = opiedb2 |
24 | VERSION = 1.8.1 | 24 | VERSION = 1.8.1 |
25 | INCLUDEPATH += $(OPIEDIR)/include | 25 | INCLUDEPATH += $(OPIEDIR)/include |
26 | DEPENDPATH += $(OPIEDIR)/include | 26 | DEPENDPATH += $(OPIEDIR)/include |
27 | 27 | ||
28 | MOC_DIR = moc | 28 | MOC_DIR = moc |
29 | OBJECTS_DIR = obj | 29 | OBJECTS_DIR = obj |
30 | 30 | ||
31 | include ( $(OPIEDIR)/include.pro ) | 31 | !contains( platform, x11 ) { |
32 | include ( $(OPIEDIR)/include.pro ) | ||
33 | } | ||
34 | |||
35 | contains( 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 | |||
@@ -1,24 +1,26 @@ | |||
1 | 1 | ||
2 | #ifndef OSQL_MANAGER_H | 2 | #ifndef OSQL_MANAGER_H |
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 |
12 | * services | 14 | * services |
13 | * Load a OSQLDriver and delete it yourself | 15 | * Load a OSQLDriver and delete it yourself |
14 | * | 16 | * |
15 | */ | 17 | */ |
16 | class OSQLDriver; | 18 | class OSQLDriver; |
17 | class OSQLManager : public QObject { | 19 | class OSQLManager : public QObject { |
18 | Q_OBJECT | 20 | Q_OBJECT |
19 | public: | 21 | public: |
20 | /** | 22 | /** |
21 | * Empty c'tor | 23 | * Empty c'tor |
22 | */ | 24 | */ |
23 | OSQLManager(); | 25 | OSQLManager(); |
24 | 26 | ||