--- a/javamanager/subsystem.mk	Thu Jul 15 18:31:06 2010 +0300
+++ b/javamanager/subsystem.mk	Thu Aug 19 09:48:13 2010 +0300
@@ -21,28 +21,42 @@
 	javainstaller \
 	javaregistry \
 	javabackup \
-	javasettings
+	javasettings 
 
 COMPONENTS = \
 	preinstaller/build \
 	debugapi/build \
-	javalauncher/build
-
+	javalauncher/build \
+	javaupgradeapp/build 
+    
 NONQTSUBSYSTEMS = \
-	javasidchecker/build \
-	javarecognizer/build \
-	javaappschemeplugin/build
+	javarecognizer/build 
 
 SYMBIAN_ONLY = \
 	javaregistry \
 	javalauncher/build \
+	javaupgradeapp/build \
 	javabackup \
-	javasidchecker/build \
 	javarecognizer/build \
 	preinstaller/build \
-	debugapi/build \
-	javaappschemeplugin/build
+	debugapi/build 
 
+ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS    
+NONQTSUBSYSTEMS += javasidchecker/build javaappschemeplugin/build 
+SYMBIAN_ONLY += javasidchecker/build javaappschemeplugin/build 
 javasidchecker/build : javaregistry
+else
+COMPONENTS += javaappscheme/build javaqtrequest/build 
+SYMBIAN_ONLY += javaappscheme/build javaqtrequest/build 
+endif
+
+ifdef RD_JAVA_APPLICATION_SETTINGS_QT
+COMPONENTS += javasettings_qt/build 
+SYMBIAN_ONLY += javasettings_qt/build 
+endif
+
+# Declare that release preparation removes subdirectories not in build, except
+# listed special cases
+REMOVE_NOTBUILT_EXCLUDING = inc
 
 include ${JAVA_SRC_ROOT}/build/Makefile.subsystem