summaryrefslogtreecommitdiff
path: root/libopie2/opieui
authortille <tille>2003-08-25 12:56:53 (UTC)
committer tille <tille>2003-08-25 12:56:53 (UTC)
commitc817abf3b81ca47927433ede1efd9afddfc15a72 (patch) (side-by-side diff)
tree3e5727ad9bd9b54475f04d2be33bb8db6e26636f /libopie2/opieui
parentff72e85696d070efa03975ea8130807579a6e1d9 (diff)
downloadopie-c817abf3b81ca47927433ede1efd9afddfc15a72.zip
opie-c817abf3b81ca47927433ede1efd9afddfc15a72.tar.gz
opie-c817abf3b81ca47927433ede1efd9afddfc15a72.tar.bz2
libopie2 compiles for qt3/x11 now
run: qmake "platform=x11" libopie2.pro
Diffstat (limited to 'libopie2/opieui') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/opieui.pro20
-rw-r--r--libopie2/opieui/oversatileview.h2
2 files changed, 16 insertions, 6 deletions
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 \
oversatileviewitem.h \
#ojanuswidget.h \
odialog.h \
- oseparator.h \
- otaskbarapplet.h
+ oseparator.h
+# otaskbarapplet.h
SOURCES = ocompletionbox.cpp \
ocombobox.cpp \
@@ -32,8 +32,8 @@ SOURCES = ocompletionbox.cpp \
oversatileviewitem.cpp \
#ojanuswidget.cpp \
odialog.cpp \
- oseparator.cpp \
- otaskbarapplet.cpp
+ oseparator.cpp #\
+# otaskbarapplet.cpp
INTERFACES =
TARGET = opieui2
@@ -44,5 +44,15 @@ LIBS += -lopiecore2
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
@@ -38,7 +38,7 @@
/* OPIE */
-#include <qpe/qpeapplication.h>
+#include <opie2/oapplication.h>
/* FORWARDS */