summaryrefslogtreecommitdiff
authorzecke <zecke>2004-08-25 21:22:54 (UTC)
committer zecke <zecke>2004-08-25 21:22:54 (UTC)
commit834a1cfd0367f7c2ed6e250666624104c450d542 (patch) (side-by-side diff)
treeaee658da073a597919819878c25c812db9b7567e
parent7d89975c7fe8e67af4e201d7038640cfbfc515fb (diff)
downloadopie-834a1cfd0367f7c2ed6e250666624104c450d542.zip
opie-834a1cfd0367f7c2ed6e250666624104c450d542.tar.gz
opie-834a1cfd0367f7c2ed6e250666624104c450d542.tar.bz2
-Make libqpe work without RoHFeedback
-Use only a define in library.pro and add source code conditional.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make2
-rw-r--r--library/library.pro6
2 files changed, 4 insertions, 4 deletions
diff --git a/Rules.make b/Rules.make
index 04cfbee..e8b2420 100644
--- a/Rules.make
+++ b/Rules.make
@@ -53,9 +53,9 @@ endif
ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
echo CONFIG += no-override >> $@
endif
ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y)
- echo DEFINES += OPIE_WITHROHFEEDBACK >> $@
+ echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@
endif
ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y)
echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@
endif
diff --git a/library/library.pro b/library/library.pro
index af07fa3..1f68b74 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -46,9 +46,8 @@ HEADERS = calendar.h \
backend/palmtoprecord.h \
backend/task.h \
backend/event.h \
backend/contact.h\
- backend/rohfeedback.h \
categorymenu.h \
categoryedit_p.h \
categoryselect.h \
categorywidget.h \
@@ -106,9 +105,8 @@ SOURCES = calendar.cpp \
backend/palmtoprecord.cpp \
backend/task.cpp \
backend/event.cpp \
backend/contact.cpp \
- backend/rohfeedback.cpp \
categorymenu.cpp \
categoryedit_p.cpp \
categoryselect.cpp \
categorywidget.cpp \
@@ -138,6 +136,8 @@ contains( CONFIG, no-override ){
DEFINES += OPIE_NO_OVERRIDE_QT
}
contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){
- DEFINES += WITHROHFEEDBACK
+ DEFINES += OPIE_ROHFEEDBACK
+ SOURCES += backend/rohfeedback.cpp
+ HEADERS += backend/rohfeedback.h
}