diff -r e5618cc85d74 -r 6c158198356e javaextensions/satsa/build/javasatsa.pro
--- a/javaextensions/satsa/build/javasatsa.pro	Thu Jul 15 18:31:06 2010 +0300
+++ b/javaextensions/satsa/build/javasatsa.pro	Thu Aug 19 09:48:13 2010 +0300
@@ -11,7 +11,7 @@
 #
 # Contributors:
 #
-# Description: 
+# Description:
 #
 
 TARGET=javasatsa
@@ -19,25 +19,36 @@
 CONFIG += omj java  stl
 CONFIG -= qt
 
+
+
 symbian {
+
+
  			INCLUDEPATH +=  ../framework/inc	\
                             ../pki/inc	\
                             ../apdu/inc	\
  							../../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 \
                         ../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 +62,7 @@
 								 -laknnotify \
 								 -leiksrv \
 								 -lctframework \
-								 -lctsecdlgs \ 
+								 -lctsecdlgs \
 								 -lcustomapi \
 								 -lefsrv \
 								 -letel \
@@ -61,9 +72,17 @@
 								 -lhash \
 								 -lWimClient	\
 								 -lestlib	\
-								 -lcryptography \		
-								   
- 
+								 -lcryptography \
+
+		contains(PROJECT_DEFINES,RD_JAVA_S60_RELEASE_10_1_ONWARDS) {
+        
+        LIBS += -lHbCore\
+								-lQtGui\
+								-lQtCore\
+
+				}
+
+
  }
 
 include(../../../build/omj.pri)