summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-08-05 17:29:18 (UTC)
committer mickeyl <mickeyl>2004-08-05 17:29:18 (UTC)
commit9623c26c4f68496515a096bd2a85502ab15ca966 (patch) (side-by-side diff)
tree2ef17124c61a83a247b4ba31225526881f7b0ba6
parentde7547111c8ee5b2424a405ba9d4454d753f465e (diff)
downloadopie-9623c26c4f68496515a096bd2a85502ab15ca966.zip
opie-9623c26c4f68496515a096bd2a85502ab15ca966.tar.gz
opie-9623c26c4f68496515a096bd2a85502ab15ca966.tar.bz2
compensate for oticker moval
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 @@
TEMPLATE = lib
CONFIG += qt warn_on
DESTDIR = $(OPIEDIR)/lib
HEADERS = oclickablelabel.h \
odialog.h \
ofontselector.h \
oimageeffect.h \
okeyconfigwidget.h \
olistview.h \
opixmapeffect.h \
opopupmenu.h \
opixmapprovider.h \
oselector.h \
oseparator.h \
otabinfo.h \
otabbar.h \
otabwidget.h \
otaskbarapplet.h \
- oticker.h \
otimepicker.h \
oversatileview.h \
oversatileviewitem.h \
owait.h
SOURCES = oclickablelabel.cpp \
odialog.cpp \
ofontselector.cpp \
oimageeffect.cpp \
okeyconfigwidget.cpp \
olistview.cpp \
opixmapeffect.cpp \
opopupmenu.cpp \
opixmapprovider.cpp \
oselector.cpp \
oseparator.cpp \
otabbar.cpp \
otabwidget.cpp \
otaskbarapplet.cpp \
- oticker.cpp \
otimepicker.cpp \
oversatileview.cpp \
oversatileviewitem.cpp \
owait.cpp
include ( big-screen/big-screen.pro )
include ( fileselector/fileselector.pro )
INTERFACES = otimepickerbase.ui
TARGET = opieui2
VERSION = 1.8.5
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lopiecore2
!contains( platform, x11 ) {
include ( $(OPIEDIR)/include.pro )
}
contains( platform, x11 ) {
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 @@
TEMPLATE = lib
CONFIG += qte warn_on
HEADERS = qcolordialog.h \
qsplitter.h \
qinputdialog.h \
\
ocolorpopupmenu.h \
- ocolorbutton.h
+ ocolorbutton.h \
+ oticker.h
SOURCES = qcolordialog.cpp \
qsplitter.cpp \
qinputdialog.cpp \
\
ocolorpopupmenu.cpp \
- ocolorbutton.cpp
+ ocolorbutton.cpp \
+ oticker.cpp
TARGET = qtaux2
INCLUDEPATH += $(OPIEDIR)/include
DESTDIR = $(OPIEDIR)/lib
include ( $(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 @@
config TODAY_FORTUNE
boolean "opie-today-fortuneplugin (a joke a day keeps the doctor away)"
default "y"
- depends (LIBQPE || LIBQPE-X11) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && TODAY
+ depends (LIBQPE || LIBQPE-X11) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBQTAUX && TODAY
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 @@
TEMPLATE = lib
CONFIG += qt plugin
# Input
HEADERS = fortuneplugin.h fortunepluginimpl.h \
fortunepluginwidget.h
SOURCES = fortuneplugin.cpp fortunepluginimpl.cpp \
fortunepluginwidget.cpp
INCLUDEPATH += $(OPIEDIR)/include \
../ ../library
DEPENDPATH += $(OPIEDIR)/include \
../ ../library
-LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2
+LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 -lqtaux2
DESTDIR = $(OPIEDIR)/plugins/today
TARGET = todayfortuneplugin
include ( $(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 @@
config TODAY_STOCKTICKERSUB
boolean
depends TODAY_STOCKTICKERLIB
default "y" if TODAY_STOCKTICKER
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && TODAY
+ 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 @@
TEMPLATE = app
CONFIG = qt warn_on
HEADERS = inputDialog.h helpwindow.h
SOURCES = inputDialog.cpp helpwindow.cpp main.cpp
INTERFACES =
TARGET = stocktickertest
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS+= -lqpe -lopiecore2
+LIBS+= -lqpe -lopiecore2 -lqtaux2
DESTDIR = $(OPIEDIR)/bin
include ( $(OPIEDIR)/include.pro )