--- a/javaextensions/satsa/build/javasatsa.pro	Wed Sep 01 12:33:18 2010 +0100
+++ b/javaextensions/satsa/build/javasatsa.pro	Tue Sep 14 21:06:50 2010 +0300
@@ -14,12 +14,21 @@
 # Description:
 #
 
+include(../../../inc/build_defines.pri)
+
 TARGET=javasatsa
 TEMPLATE=lib
-CONFIG += omj java  stl
-CONFIG -= qt
+CONFIG += omj java stl
 
-
+contains(PROJECT_DEFINES,RD_JAVA_S60_RELEASE_5_0) {
+    CONFIG -= qt
+}
+contains(PROJECT_DEFINES,RD_JAVA_S60_RELEASE_9_2) {
+    CONFIG -= qt
+}
+contains(PROJECT_DEFINES,RD_JAVA_S60_RELEASE_10_1_ONWARDS) {
+    CONFIG += hb
+}
 
 symbian {
 
@@ -30,12 +39,6 @@
  							../../inc	\
  							../../../inc \
 
- 			contains(PROJECT_DEFINES,RD_JAVA_S60_RELEASE_10_1_ONWARDS) {
-        
-        INCLUDEPATH += /epoc32/include/mw/hb/hbcore  \
-                     	/epoc32/include/mw/QtCore   \
-                      /epoc32/include/mw/QtGui   \
-             }
 
 
  			SOURCES +=  ../pki/src.s60/*.cpp \
@@ -59,7 +62,6 @@
 								 -lcertstore \
 								 -lcharconv \
 								 -lcms \
-								 -laknnotify \
 								 -leiksrv \
 								 -lctframework \
 								 -lctsecdlgs \
@@ -74,15 +76,14 @@
 								 -lestlib	\
 								 -lcryptography \
 
-		contains(PROJECT_DEFINES,RD_JAVA_S60_RELEASE_10_1_ONWARDS) {
-        
-        LIBS += -lHbCore\
-								-lQtGui\
-								-lQtCore\
 
-				}
-
-
+contains(PROJECT_DEFINES,RD_JAVA_S60_RELEASE_5_0) {
+        LIBS +=    -laknnotify \
+    }
+contains(PROJECT_DEFINES,RD_JAVA_S60_RELEASE_9_2) {
+        LIBS +=    -laknnotify \
+    }
+		
  }
 
 include(../../../build/omj.pri)