-Make libqpe work without RoHFeedback

-Use only a define in library.pro and add source code
 conditional.

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
@@ -56,3 +56,3 @@ endif
 ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y)
-        echo DEFINES += OPIE_WITHROHFEEDBACK >> $@
+        echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@
 endif
diff --git a/library/library.pro b/library/library.pro
index af07fa3..1f68b74 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -49,3 +49,2 @@ HEADERS	=   calendar.h \
             backend/contact.h\
-            backend/rohfeedback.h \
             categorymenu.h \
@@ -109,3 +108,2 @@ SOURCES	=   calendar.cpp \
             backend/contact.cpp \
-            backend/rohfeedback.cpp \
             categorymenu.cpp \
@@ -141,3 +139,5 @@ contains( CONFIG, no-override ){
 contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){
-    DEFINES += WITHROHFEEDBACK
+    DEFINES += OPIE_ROHFEEDBACK
+    SOURCES += backend/rohfeedback.cpp
+    HEADERS += backend/rohfeedback.h
 }