--- a/javaextensions/satsa/build/javasatsa.pro	Fri Jul 23 12:27:20 2010 +0300
+++ b/javaextensions/satsa/build/javasatsa.pro	Thu Aug 05 16:07:57 2010 +0300
@@ -11,33 +11,47 @@
 #
 # Contributors:
 #
-# Description: 
+# 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 {
+
+
  			INCLUDEPATH +=  ../framework/inc	\
                             ../pki/inc	\
                             ../apdu/inc	\
  							../../inc	\
  							../../../inc \
-                   	 
- 										  			
+
+
+
  			SOURCES +=  ../pki/src.s60/*.cpp \
                         ../crypto/src/*.cpp \
                         ../apdu/src/*.cpp	\
                         ../apdu/src.s60/*.cpp   \
                         ../framework/src/satsajnitools.cpp \
-                 							  								 
- 								  			
+
+
  			LIBS +=    -ljavastorage	\
  								 -lCommonUI \
  								 -lrandom \
-								 -lx509	\
+ 								 -lx509	\
 								 -lx500	\
 								 -llibcrypto \
 								 -lasn1	\
@@ -51,7 +65,7 @@
 								 -laknnotify \
 								 -leiksrv \
 								 -lctframework \
-								 -lctsecdlgs \ 
+								 -lctsecdlgs \
 								 -lcustomapi \
 								 -lefsrv \
 								 -letel \
@@ -61,10 +75,9 @@
 								 -lhash \
 								 -lWimClient	\
 								 -lestlib	\
-								 -lcryptography \		
-                                 
-								   
- 
+								 -lcryptography \
+
+
  }
 
 include(../../../build/omj.pri)