author | zecke <zecke> | 2004-08-25 21:22:54 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-25 21:22:54 (UTC) |
commit | 834a1cfd0367f7c2ed6e250666624104c450d542 (patch) (unidiff) | |
tree | aee658da073a597919819878c25c812db9b7567e | |
parent | 7d89975c7fe8e67af4e201d7038640cfbfc515fb (diff) | |
download | opie-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.
-rw-r--r-- | Rules.make | 2 | ||||
-rw-r--r-- | library/library.pro | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -54,7 +54,7 @@ ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) | |||
54 | echo CONFIG += no-override >> $@ | 54 | echo CONFIG += no-override >> $@ |
55 | endif | 55 | endif |
56 | ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y) | 56 | ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y) |
57 | echo DEFINES += OPIE_WITHROHFEEDBACK >> $@ | 57 | echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@ |
58 | endif | 58 | endif |
59 | ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) | 59 | ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) |
60 | echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@ | 60 | echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@ |
diff --git a/library/library.pro b/library/library.pro index af07fa3..1f68b74 100644 --- a/library/library.pro +++ b/library/library.pro | |||
@@ -47,7 +47,6 @@ HEADERS = calendar.h \ | |||
47 | backend/task.h \ | 47 | backend/task.h \ |
48 | backend/event.h \ | 48 | backend/event.h \ |
49 | backend/contact.h\ | 49 | backend/contact.h\ |
50 | backend/rohfeedback.h \ | ||
51 | categorymenu.h \ | 50 | categorymenu.h \ |
52 | categoryedit_p.h \ | 51 | categoryedit_p.h \ |
53 | categoryselect.h \ | 52 | categoryselect.h \ |
@@ -107,7 +106,6 @@ SOURCES = calendar.cpp \ | |||
107 | backend/task.cpp \ | 106 | backend/task.cpp \ |
108 | backend/event.cpp \ | 107 | backend/event.cpp \ |
109 | backend/contact.cpp \ | 108 | backend/contact.cpp \ |
110 | backend/rohfeedback.cpp \ | ||
111 | categorymenu.cpp \ | 109 | categorymenu.cpp \ |
112 | categoryedit_p.cpp \ | 110 | categoryedit_p.cpp \ |
113 | categoryselect.cpp \ | 111 | categoryselect.cpp \ |
@@ -139,5 +137,7 @@ contains( CONFIG, no-override ){ | |||
139 | } | 137 | } |
140 | 138 | ||
141 | contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){ | 139 | contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){ |
142 | DEFINES += WITHROHFEEDBACK | 140 | DEFINES += OPIE_ROHFEEDBACK |
141 | SOURCES += backend/rohfeedback.cpp | ||
142 | HEADERS += backend/rohfeedback.h | ||
143 | } | 143 | } |