--- a/layers.sysdef.xml	Thu Aug 19 09:43:35 2010 +0300
+++ b/layers.sysdef.xml	Tue Aug 31 15:06:34 2010 +0300
@@ -1,25 +1,20 @@
 <?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_1.dtd" [
   <!ENTITY layer_real_source_path "sf/app/homescreen" >
 ]>
 
-<SystemDefinition name="homescreen" schema="1.4.0">
+<SystemDefinition name="homescreen" schema="1.5.1">
   <systemModel>
-
-
-    <layer name="app_layer">
-      <module name="homescreen">
-        <unit unitID="hs.homescreen" mrp="" bldFile="&layer_real_source_path;/group" name="homescreen" />
-      </module>
-    </layer>
-
-    <layer name="unit_test_layer">
-      <module name="homescreen_unit_tests">
-         <unit unitID="hsdo.wmunit.test" mrp="" bldFile="&layer_real_source_path;/idlehomescreen/widgetmanager/tsrc/wmunittest/group" name="wmunit.test" />
-      </module>
-    </layer>
-
-  </systemModel>
+        <layer name="app_layer">
+            <module name="homescreen">
+                <unit name="homescreen" unitID="homescreen" bldFile="&layer_real_source_path;" mrp="" proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
+            </module>
+        </layer>
+        
+        <layer name="unit_test_layer">
+          <module name="hs_app_unit_test">
+            <unit unitID="hsdo.hs_app_unit_test" name="hs_app_unit_test" bldFile="&layer_real_source_path;/tsrc" mrp="" proFile="tsrc.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+          </module>
+        </layer>
+    </systemModel>
 </SystemDefinition>
-
-