-rw-r--r-- | libopie2/opieui/opieui.pro | 20 | ||||
-rw-r--r-- | libopie2/opieui/oversatileview.h | 2 |
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 | |||
@@ -12,14 +12,14 @@ HEADERS = ocompletionbox.h \ | |||
12 | opixmapprovider.h \ | 12 | opixmapprovider.h \ |
13 | oselector.h \ | 13 | oselector.h \ |
14 | oversatileview.h \ | 14 | oversatileview.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 | ||
21 | SOURCES = ocompletionbox.cpp \ | 21 | SOURCES = ocompletionbox.cpp \ |
22 | ocombobox.cpp \ | 22 | ocombobox.cpp \ |
23 | oeditlistbox.cpp \ | 23 | oeditlistbox.cpp \ |
24 | olineedit.cpp \ | 24 | olineedit.cpp \ |
25 | olistview.cpp \ | 25 | olistview.cpp \ |
@@ -29,20 +29,30 @@ SOURCES = ocompletionbox.cpp \ | |||
29 | opixmapprovider.cpp \ | 29 | opixmapprovider.cpp \ |
30 | oselector.cpp \ | 30 | oselector.cpp \ |
31 | oversatileview.cpp \ | 31 | oversatileview.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 | ||
38 | INTERFACES = | 38 | INTERFACES = |
39 | TARGET = opieui2 | 39 | TARGET = opieui2 |
40 | VERSION = 1.8.1 | 40 | VERSION = 1.8.1 |
41 | INCLUDEPATH += $(OPIEDIR)/include | 41 | INCLUDEPATH += $(OPIEDIR)/include |
42 | DEPENDPATH += $(OPIEDIR)/include | 42 | DEPENDPATH += $(OPIEDIR)/include |
43 | LIBS += -lopiecore2 | 43 | LIBS += -lopiecore2 |
44 | MOC_DIR = moc | 44 | MOC_DIR = moc |
45 | OBJECTS_DIR = obj | 45 | OBJECTS_DIR = obj |
46 | 46 | ||
47 | include ( $(OPIEDIR)/include.pro ) | 47 | |
48 | !contains( platform, x11 ) { | ||
49 | include ( $(OPIEDIR)/include.pro ) | ||
50 | HEADERS += otaskbarapplet.h | ||
51 | SOURCES += otaskbarapplet.cpp | ||
52 | } | ||
53 | |||
54 | contains( 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 | |||
@@ -35,13 +35,13 @@ | |||
35 | 35 | ||
36 | #include <qwidgetstack.h> | 36 | #include <qwidgetstack.h> |
37 | #include <qiconview.h> | 37 | #include <qiconview.h> |
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 | ||
45 | class QHeader; | 45 | class QHeader; |
46 | class QIconSet; | 46 | class QIconSet; |
47 | class QIconViewItem; | 47 | class QIconViewItem; |