--- a/javamanager/subsystem.mk Tue Jul 06 14:10:26 2010 +0300
+++ b/javamanager/subsystem.mk Wed Aug 18 09:43:15 2010 +0300
@@ -21,17 +21,16 @@
javainstaller \
javaregistry \
javabackup \
- javasettings
+ javasettings
COMPONENTS = \
preinstaller/build \
debugapi/build \
javalauncher/build \
- javaupgradeapp/build
-
+ javaupgradeapp/build
+
NONQTSUBSYSTEMS = \
- javarecognizer/build \
- javaappschemeplugin/build
+ javarecognizer/build
SYMBIAN_ONLY = \
javaregistry \
@@ -40,13 +39,20 @@
javabackup \
javarecognizer/build \
preinstaller/build \
- debugapi/build \
- javaappschemeplugin/build
+ debugapi/build
ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS
-NONQTSUBSYSTEMS += javasidchecker/build
-SYMBIAN_ONLY += javasidchecker/build
+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