summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/opieui.pro2
-rw-r--r--libqtaux/libqtaux.pro6
-rw-r--r--noncore/todayplugins/fortune/config.in2
-rw-r--r--noncore/todayplugins/fortune/fortune.pro2
-rw-r--r--noncore/todayplugins/stockticker/stockticker/config.in2
-rw-r--r--noncore/todayplugins/stockticker/stockticker/stockticker.pro2
6 files changed, 8 insertions, 8 deletions
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index e97e82c..16be120 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -1,63 +1,61 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3DESTDIR = $(OPIEDIR)/lib 3DESTDIR = $(OPIEDIR)/lib
4HEADERS = oclickablelabel.h \ 4HEADERS = oclickablelabel.h \
5 odialog.h \ 5 odialog.h \
6 ofontselector.h \ 6 ofontselector.h \
7 oimageeffect.h \ 7 oimageeffect.h \
8 okeyconfigwidget.h \ 8 okeyconfigwidget.h \
9 olistview.h \ 9 olistview.h \
10 opixmapeffect.h \ 10 opixmapeffect.h \
11 opopupmenu.h \ 11 opopupmenu.h \
12 opixmapprovider.h \ 12 opixmapprovider.h \
13 oselector.h \ 13 oselector.h \
14 oseparator.h \ 14 oseparator.h \
15 otabinfo.h \ 15 otabinfo.h \
16 otabbar.h \ 16 otabbar.h \
17 otabwidget.h \ 17 otabwidget.h \
18 otaskbarapplet.h \ 18 otaskbarapplet.h \
19 oticker.h \
20 otimepicker.h \ 19 otimepicker.h \
21 oversatileview.h \ 20 oversatileview.h \
22 oversatileviewitem.h \ 21 oversatileviewitem.h \
23 owait.h 22 owait.h
24 23
25SOURCES = oclickablelabel.cpp \ 24SOURCES = oclickablelabel.cpp \
26 odialog.cpp \ 25 odialog.cpp \
27 ofontselector.cpp \ 26 ofontselector.cpp \
28 oimageeffect.cpp \ 27 oimageeffect.cpp \
29 okeyconfigwidget.cpp \ 28 okeyconfigwidget.cpp \
30 olistview.cpp \ 29 olistview.cpp \
31 opixmapeffect.cpp \ 30 opixmapeffect.cpp \
32 opopupmenu.cpp \ 31 opopupmenu.cpp \
33 opixmapprovider.cpp \ 32 opixmapprovider.cpp \
34 oselector.cpp \ 33 oselector.cpp \
35 oseparator.cpp \ 34 oseparator.cpp \
36 otabbar.cpp \ 35 otabbar.cpp \
37 otabwidget.cpp \ 36 otabwidget.cpp \
38 otaskbarapplet.cpp \ 37 otaskbarapplet.cpp \
39 oticker.cpp \
40 otimepicker.cpp \ 38 otimepicker.cpp \
41 oversatileview.cpp \ 39 oversatileview.cpp \
42 oversatileviewitem.cpp \ 40 oversatileviewitem.cpp \
43 owait.cpp 41 owait.cpp
44 42
45include ( big-screen/big-screen.pro ) 43include ( big-screen/big-screen.pro )
46include ( fileselector/fileselector.pro ) 44include ( fileselector/fileselector.pro )
47 45
48INTERFACES = otimepickerbase.ui 46INTERFACES = otimepickerbase.ui
49 47
50TARGET = opieui2 48TARGET = opieui2
51VERSION = 1.8.5 49VERSION = 1.8.5
52 50
53INCLUDEPATH += $(OPIEDIR)/include 51INCLUDEPATH += $(OPIEDIR)/include
54DEPENDPATH += $(OPIEDIR)/include 52DEPENDPATH += $(OPIEDIR)/include
55 53
56LIBS += -lopiecore2 54LIBS += -lopiecore2
57 55
58!contains( platform, x11 ) { 56!contains( platform, x11 ) {
59 include ( $(OPIEDIR)/include.pro ) 57 include ( $(OPIEDIR)/include.pro )
60} 58}
61 59
62contains( platform, x11 ) { 60contains( platform, x11 ) {
63 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 61 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
diff --git a/libqtaux/libqtaux.pro b/libqtaux/libqtaux.pro
index 5893015..39a9855 100644
--- a/libqtaux/libqtaux.pro
+++ b/libqtaux/libqtaux.pro
@@ -1,24 +1,26 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qte warn_on 2CONFIG += qte warn_on
3 3
4HEADERS = qcolordialog.h \ 4HEADERS = qcolordialog.h \
5 qsplitter.h \ 5 qsplitter.h \
6 qinputdialog.h \ 6 qinputdialog.h \
7 \ 7 \
8 ocolorpopupmenu.h \ 8 ocolorpopupmenu.h \
9 ocolorbutton.h 9 ocolorbutton.h \
10 oticker.h
10 11
11 12
12SOURCES = qcolordialog.cpp \ 13SOURCES = qcolordialog.cpp \
13 qsplitter.cpp \ 14 qsplitter.cpp \
14 qinputdialog.cpp \ 15 qinputdialog.cpp \
15 \ 16 \
16 ocolorpopupmenu.cpp \ 17 ocolorpopupmenu.cpp \
17 ocolorbutton.cpp 18 ocolorbutton.cpp \
19 oticker.cpp
18 20
19TARGET = qtaux2 21TARGET = qtaux2
20INCLUDEPATH += $(OPIEDIR)/include 22INCLUDEPATH += $(OPIEDIR)/include
21DESTDIR = $(OPIEDIR)/lib 23DESTDIR = $(OPIEDIR)/lib
22 24
23 25
24include ( $(OPIEDIR)/include.pro ) 26include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/todayplugins/fortune/config.in b/noncore/todayplugins/fortune/config.in
index ca476f1..ec74b50 100644
--- a/noncore/todayplugins/fortune/config.in
+++ b/noncore/todayplugins/fortune/config.in
@@ -1,5 +1,5 @@
1 config TODAY_FORTUNE 1 config TODAY_FORTUNE
2 boolean "opie-today-fortuneplugin (a joke a day keeps the doctor away)" 2 boolean "opie-today-fortuneplugin (a joke a day keeps the doctor away)"
3 default "y" 3 default "y"
4 depends (LIBQPE || LIBQPE-X11) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && TODAY 4 depends (LIBQPE || LIBQPE-X11) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBQTAUX && TODAY
5 depends TODAY 5 depends TODAY
diff --git a/noncore/todayplugins/fortune/fortune.pro b/noncore/todayplugins/fortune/fortune.pro
index 74c60b1..0eeb22b 100644
--- a/noncore/todayplugins/fortune/fortune.pro
+++ b/noncore/todayplugins/fortune/fortune.pro
@@ -1,20 +1,20 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt plugin 2CONFIG += qt plugin
3 3
4# Input 4# Input
5HEADERS = fortuneplugin.h fortunepluginimpl.h \ 5HEADERS = fortuneplugin.h fortunepluginimpl.h \
6 fortunepluginwidget.h 6 fortunepluginwidget.h
7SOURCES = fortuneplugin.cpp fortunepluginimpl.cpp \ 7SOURCES = fortuneplugin.cpp fortunepluginimpl.cpp \
8 fortunepluginwidget.cpp 8 fortunepluginwidget.cpp
9 9
10INCLUDEPATH += $(OPIEDIR)/include \ 10INCLUDEPATH += $(OPIEDIR)/include \
11 ../ ../library 11 ../ ../library
12DEPENDPATH += $(OPIEDIR)/include \ 12DEPENDPATH += $(OPIEDIR)/include \
13 ../ ../library 13 ../ ../library
14 14
15LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 15LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 -lqtaux2
16 16
17DESTDIR = $(OPIEDIR)/plugins/today 17DESTDIR = $(OPIEDIR)/plugins/today
18TARGET = todayfortuneplugin 18TARGET = todayfortuneplugin
19 19
20include ( $(OPIEDIR)/include.pro ) 20include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/todayplugins/stockticker/stockticker/config.in b/noncore/todayplugins/stockticker/stockticker/config.in
index 1252b63..9d9efa4 100644
--- a/noncore/todayplugins/stockticker/stockticker/config.in
+++ b/noncore/todayplugins/stockticker/stockticker/config.in
@@ -1,5 +1,5 @@
1config TODAY_STOCKTICKERSUB 1config TODAY_STOCKTICKERSUB
2 boolean 2 boolean
3 depends TODAY_STOCKTICKERLIB 3 depends TODAY_STOCKTICKERLIB
4 default "y" if TODAY_STOCKTICKER 4 default "y" if TODAY_STOCKTICKER
5 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && TODAY 5 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBQTAUX TODAY
diff --git a/noncore/todayplugins/stockticker/stockticker/stockticker.pro b/noncore/todayplugins/stockticker/stockticker/stockticker.pro
index 8c2e9df..1b49f0c 100644
--- a/noncore/todayplugins/stockticker/stockticker/stockticker.pro
+++ b/noncore/todayplugins/stockticker/stockticker/stockticker.pro
@@ -1,12 +1,12 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG = qt warn_on 2CONFIG = qt warn_on
3HEADERS = inputDialog.h helpwindow.h 3HEADERS = inputDialog.h helpwindow.h
4SOURCES = inputDialog.cpp helpwindow.cpp main.cpp 4SOURCES = inputDialog.cpp helpwindow.cpp main.cpp
5INTERFACES = 5INTERFACES =
6TARGET = stocktickertest 6TARGET = stocktickertest
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
9LIBS+= -lqpe -lopiecore2 9LIBS+= -lqpe -lopiecore2 -lqtaux2
10DESTDIR = $(OPIEDIR)/bin 10DESTDIR = $(OPIEDIR)/bin
11 11
12include ( $(OPIEDIR)/include.pro ) 12include ( $(OPIEDIR)/include.pro )