--- a/javaextensions/satsa/build/javasatsa.pro	Tue Aug 31 15:09:22 2010 +0300
+++ b/javaextensions/satsa/build/javasatsa.pro	Wed Sep 01 12:33:18 2010 +0100
@@ -14,21 +14,12 @@
 # Description:
 #
 
-include(../../../inc/build_defines.pri)
-
 TARGET=javasatsa
 TEMPLATE=lib
-CONFIG += omj java stl
+CONFIG += omj java  stl
+CONFIG -= qt
 
-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 {
 
@@ -39,6 +30,12 @@
  							../../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 \
@@ -62,8 +59,10 @@
 								 -lcertstore \
 								 -lcharconv \
 								 -lcms \
+								 -laknnotify \
 								 -leiksrv \
 								 -lctframework \
+								 -lctsecdlgs \
 								 -lcustomapi \
 								 -lefsrv \
 								 -letel \
@@ -75,16 +74,15 @@
 								 -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 \
-        					 -lctsecdlgs \
-    }
-contains(PROJECT_DEFINES,RD_JAVA_S60_RELEASE_9_2) {
-        LIBS +=    -laknnotify \
-        					 -lctsecdlgs \
-    }
-		
+				}
+
+
  }
 
 include(../../../build/omj.pri)