# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1286146620 -10800
# Node ID 6815a94083f16a5641507ee2b0b8c90ec5fec007
# Parent  a0ce86df2348736f6efa32b43c0dba0e76fe185b
Revision: 201037
Kit: 201039

diff -r a0ce86df2348 -r 6815a94083f1 sysdef_1_4_0.dtd
--- a/sysdef_1_4_0.dtd	Fri Sep 17 08:35:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
- <!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  levels CDATA #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset name CDATA #REQUIRED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
-  name CDATA #REQUIRED
-  level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  unitID ID #REQUIRED
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  bldFile CDATA #REQUIRED
-  priority CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
-  name CDATA #REQUIRED
-  version CDATA #REQUIRED
-  late (Y|N) #IMPLIED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y | N | y | n) #REQUIRED
-  targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  command CDATA #REQUIRED>  
diff -r a0ce86df2348 -r 6815a94083f1 sysdef_1_5_1.dtd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sysdef_1_5_1.dtd	Mon Oct 04 01:57:00 2010 +0300
@@ -0,0 +1,88 @@
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+  name CDATA #REQUIRED
+  level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  unitID ID #REQUIRED
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  bldFile CDATA #REQUIRED
+  priority CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  proFile CDATA #IMPLIED
+  qmakeArgs CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
+  late (Y|N) #IMPLIED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N | y | n) #REQUIRED
+  targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  command CDATA #REQUIRED>  
diff -r a0ce86df2348 -r 6815a94083f1 uiconfig/s60config/group/bld.inf
--- a/uiconfig/s60config/group/bld.inf	Fri Sep 17 08:35:27 2010 +0300
+++ b/uiconfig/s60config/group/bld.inf	Mon Oct 04 01:57:00 2010 +0300
@@ -33,6 +33,7 @@
 
 ../src/epoc_640x360_touch_qwerty.ini    /epoc32/data/epoc_640x360_touch_qwerty.ini
 ../src/epoc_360x640_touch.ini           /epoc32/data/epoc_360x640_touch.ini
+../src/epoc_360x640_touch_rotated.ini   /epoc32/data/epoc_360x640_touch_rotated.ini
 ../src/epoc_640x360_nhd4_qwerty.ini    /epoc32/data/epoc_640x360_nhd4_qwerty.ini
 ../src/epoc_360x640_nhd4.ini           /epoc32/data/epoc_360x640_nhd4.ini
 ../src/epoc_640x480_touch_qwerty.ini   /epoc32/data/epoc_640x480_touch_qwerty.ini
diff -r a0ce86df2348 -r 6815a94083f1 uiconfig/s60config/src/epoc.ini
--- a/uiconfig/s60config/src/epoc.ini	Fri Sep 17 08:35:27 2010 +0300
+++ b/uiconfig/s60config/src/epoc.ini	Mon Oct 04 01:57:00 2010 +0300
@@ -1,18 +1,18 @@
-MegabytesOfFreeMemory 48
+MegabytesOfFreeMemory 128
 
 configuration epoc_360x640_touch.ini
-configuration epoc_640x360_touch_qwerty.ini
-configuration epoc_240x320.ini
-configuration epoc_320x240.ini
-configuration epoc_480x640.ini
-configuration epoc_640x480.ini
+configuration epoc_360x640_touch_rotated.ini
 
 LogToDebugger 1
+LogToFile 1
 PlatSecDiagnostics ON
 PlatSecEnforceSysBin ON
 PlatSecProcessIsolation ON
 PlatSecEnforcement ON
-symbian_graphics_use_wserv2 ON
+symbian_base_use_gce ON
+symbian_graphics_use_gce ON
+
+FBSRASTERIZER_DLL fbsrasterizer.dll
 
 patchdata_apserv_dll_KApaLoadDataRecognizersOnDemand 1
 etel_KPriorityClientSid 0x100058B3
diff -r a0ce86df2348 -r 6815a94083f1 uiconfig/s60config/src/epoc_360x640_touch.ini
--- a/uiconfig/s60config/src/epoc_360x640_touch.ini	Fri Sep 17 08:35:27 2010 +0300
+++ b/uiconfig/s60config/src/epoc_360x640_touch.ini	Mon Oct 04 01:57:00 2010 +0300
@@ -72,9 +72,6 @@
 KeyMap Home EStdKeyApplication0
 KeyMap LeftAlt 1 EStdKeyDevice0
 KeyMap LeftAlt 2 EStdKeyDevice1
-KeyMap LeftAlt 3 EStdKeyDevice4
-KeyMap LeftAlt 4 EStdKeyDevice5
-KeyMap LeftAlt 5 EStdKeyDeviceF
 
 
 
diff -r a0ce86df2348 -r 6815a94083f1 uiconfig/s60config/src/epoc_360x640_touch_rotated.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/uiconfig/s60config/src/epoc_360x640_touch_rotated.ini	Mon Oct 04 01:57:00 2010 +0300
@@ -0,0 +1,86 @@
+ScreenWidth 360
+ScreenHeight 640
+ScreenOffsetX 50
+ScreenOffsetY 36
+
+PhysicalScreenWidth 2235
+PhysicalScreenHeight 3973
+
+WindowTitle QHD portrait touch
+JUSTINTIME 1
+
+_EPOC_DRIVE_D \epoc32\winscw\d
+_EPOC_LocDrv_1 E:
+
+MultiMediaCardSize=16000
+
+FasciaBitmap QHD_P_B.bmp
+OnActivation 270 EStdKeyApplication14
+
+
+# Default command maps a label to a keycode value.
+# If the keycode value is less than 65536, it represents an 8-bit scan-code.
+# The scan-code is mapped to the appropriate key-code in E32.
+# If the keycode value is higher, is represents a 8-bit scan-code + a 16-bit key-code multiplied by 65536 (16-bit shift).
+
+VirtualKey 1                    rect 134,740 62,22  
+VirtualKey 2                    rect 197,740 63,22  
+VirtualKey 3                    rect 261,740 65,22  
+VirtualKey 4                    rect 134,767 62,22
+VirtualKey 5                    rect 197,767 63,22
+VirtualKey 6                    rect 261,767 65,22
+VirtualKey 7                    rect 134,794 62,22
+VirtualKey 8                    rect 197,794 63,22
+VirtualKey 9                    rect 261,794 65,22
+VirtualKey EStdKeyNkpAsterisk   rect 134,821 62,22  # Asterisk key
+VirtualKey 0                    rect 197,821 63,22
+VirtualKey EStdKeyHash          rect 261,821 65,22  # Hash key
+
+VirtualKey EStdKeyDevice0       rect  51,683 62,22  # Left softkey
+VirtualKey EStdKeyDevice1       rect 347,683 62,22  # Right softkey
+
+VirtualKey EStdKeyYes           rect 134,683 44,26  # Green 
+VirtualKey EStdKeyNo            rect 282,688 44,26  # Red
+
+VirtualKey EStdKeyLeftArrow     rect 187,689 24,40  # Left
+VirtualKey EStdKeyRightArrow    rect 249,689 24,40  # Right
+VirtualKey EStdKeyUpArrow       rect 212,686 36,15  # Up
+VirtualKey EStdKeyDownArrow     rect 212,717 36,15  # Down
+
+VirtualKey EStdKeyDevice3       rect 216,702 28,14  # Selection key
+
+VirtualKey EStdKeyRightShift    rect 133,710 44,25  # Edit key
+VirtualKey EStdKeyBackspace     rect 282,710 44,25  # Clear key
+
+VirtualKey EStdKeyDevice2       rect 390,721 31,25  # Power key
+
+VirtualKey EStdKeyDevice6       rect  96,780 20,45  # Voice key
+VirtualKey EStdKeyDevice7       rect 345,798 20,45  # Camera key
+VirtualKey EStdKeyApplication0  rect  96,721 20,45  # Application key
+
+VirtualKey EStdKeyIncVolume     rect 345,721 20,27  # EKeyVolumeUp
+VirtualKey EStdKeyDecVolume     rect 345,757 20,27  # EKeyVolumeDown
+
+VirtualKey EStdKeyApplication2  rect  47,753 30,24  # EKeyPlay
+VirtualKey EStdKeyApplication3  rect  47,785 30,24  # EKeyStop
+VirtualKey EStdKeyApplication4  rect  47,721 30,24  # EKeyForward
+VirtualKey EStdKeyApplication5  rect  47,817 30,24  # EKeyRewind
+
+
+#keyboard mappings
+KeyMap BackTick EStdKeyDevice3
+KeyMap Home EStdKeyApplication0
+KeyMap LeftAlt 1 EStdKeyDevice0
+KeyMap LeftAlt 2 EStdKeyDevice1
+
+
+
+LedOffsetX 0
+LedOffsetY 0   
+LedSize 0 
+LedGap 0   
+LedArrangeVertically
+digitizeroffsetx 0
+digitizeroffsety 0
+
+EmulatorControl NextConfig rect 7,6 26,18
diff -r a0ce86df2348 -r 6815a94083f1 uiconfig/s60config/src/epoc_iti.ini
--- a/uiconfig/s60config/src/epoc_iti.ini	Fri Sep 17 08:35:27 2010 +0300
+++ b/uiconfig/s60config/src/epoc_iti.ini	Mon Oct 04 01:57:00 2010 +0300
@@ -1,12 +1,10 @@
 MegabytesOfFreeMemory 128
 
 configuration epoc_360x640_touch.ini
-configuration epoc_640x360_touch_qwerty.ini
-configuration epoc_360x640_nhd4.ini
-configuration epoc_640x360_nhd4_qwerty.ini
-configuration epoc_640x480_touch_qwerty.ini
+configuration epoc_360x640_touch_rotated.ini
 
 LogToDebugger 1
+LogToFile 1
 PlatSecDiagnostics ON
 PlatSecEnforceSysBin ON
 PlatSecProcessIsolation ON
diff -r a0ce86df2348 -r 6815a94083f1 uiconfig/s60config/src/wsini.ini
Binary file uiconfig/s60config/src/wsini.ini has changed
diff -r a0ce86df2348 -r 6815a94083f1 uiconfig/s60config/src/wsini_iti.ini
Binary file uiconfig/s60config/src/wsini_iti.ini has changed