--- a/javamanager/subsystem.mk	Wed Sep 15 12:05:25 2010 +0300
+++ b/javamanager/subsystem.mk	Wed Oct 13 14:23:59 2010 +0300
@@ -20,44 +20,29 @@
 	javacaptain \
 	javainstaller \
 	javaregistry \
-	javabackup
+	javabackup \
+	javasettings
 
 COMPONENTS = \
 	preinstaller/build \
 	debugapi/build \
-	javalauncher/build \
-	javaupgradeapp/build 
-    
+	javalauncher/build
+
 NONQTSUBSYSTEMS = \
-	javarecognizer/build 
+	javasidchecker/build \
+	javarecognizer/build \
+	javaappschemeplugin/build
 
 SYMBIAN_ONLY = \
 	javaregistry \
 	javalauncher/build \
-	javaupgradeapp/build \
 	javabackup \
+	javasidchecker/build \
 	javarecognizer/build \
 	preinstaller/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
+	debugapi/build \
+	javaappschemeplugin/build
 
-ifdef RD_JAVA_APPLICATION_SETTINGS_QT
-COMPONENTS += javasettings_qt/build 
-SYMBIAN_ONLY += javasettings_qt/build 
-else
-SUBSYSTEMS += javasettings
-endif
-
-# Declare that release preparation removes subdirectories not in build, except
-# listed special cases
-REMOVE_NOTBUILT_EXCLUDING = inc
+javasidchecker/build : javaregistry
 
 include ${JAVA_SRC_ROOT}/build/Makefile.subsystem