--- a/idlehomescreen/group/bld.inf	Thu Mar 18 14:57:41 2010 +0200
+++ b/idlehomescreen/group/bld.inf	Thu Mar 25 16:30:13 2010 +0100
@@ -15,6 +15,8 @@
 *
 */
 
+#include <platform_paths.hrh>
+
 //  uishellservices ado
 #include "../nativeuicontroller/group/bld.inf"
 #include "../exths/group/bld.inf"
@@ -32,11 +34,12 @@
 
 PRJ_PLATFORMS
 DEFAULT
-//  Help exports
-#include "../help/group/bld.inf"
+
 
 PRJ_EXPORTS
 ../loc/activeidle3.loc              APP_LAYER_LOC_EXPORT_PATH(activeidle3.loc)
+//  Help exports
+#include "../help/group/bld.inf"
 
 PRJ_MMPFILES
 

--- a/idlehomescreen/hscontentcontrol/group/hscontentcontrol.mmp	Thu Mar 18 14:57:41 2010 +0200
+++ b/idlehomescreen/hscontentcontrol/group/hscontentcontrol.mmp	Thu Mar 25 16:30:13 2010 +0100
@@ -26,6 +26,7 @@
 USERINCLUDE       ../inc
 
 APP_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE   /epoc32/include/platform/app
 
 SOURCEPATH        ../src
 

--- a/idlehomescreen/widgetmanager/group/bld.inf	Thu Mar 18 14:57:41 2010 +0200
+++ b/idlehomescreen/widgetmanager/group/bld.inf	Thu Mar 25 16:30:13 2010 +0100
@@ -16,6 +16,9 @@
 *
 */
 
+#include <data_caging_paths.hrh>
+#include <platform_paths.hrh>
+
 PRJ_PLATFORMS
 DEFAULT
 

--- a/idlehomescreen/widgetmanager/group/widgetmanager.mmp	Thu Mar 18 14:57:41 2010 +0200
+++ b/idlehomescreen/widgetmanager/group/widgetmanager.mmp	Thu Mar 25 16:30:13 2010 +0100
@@ -71,7 +71,9 @@
 
 APP_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE   /epoc32/include/ecom
-
+SYSTEMINCLUDE   /epoc32/include/platform/mw/loc/sc
+SYSTEMINCLUDE   /epoc32/include/platform/app/loc/sc
+SYSTEMINCLUDE   /epoc32/include/platform/app
 
 LIBRARY	    euser.lib
 LIBRARY     cone.lib

--- a/idlehomescreen/widgetmanager/src/wmmaincontainer.cpp	Thu Mar 18 14:57:41 2010 +0200
+++ b/idlehomescreen/widgetmanager/src/wmmaincontainer.cpp	Thu Mar 25 16:30:13 2010 +0100
@@ -48,7 +48,9 @@
 #include <avkon.rsg>
 #include <coecobs.h>
 #include <coecntrl.h>
-#include <featmgr.h>     // FeatureManager
+// this is only needed for help, see CWmMainContainer::CanDoHelp
+// we simply return false
+// #include <featmgr.h>     // FeatureManager
 #include <hlplch.h>      // HlpLauncher
 #include <csxhelp/hmsc.hlp.hrh>
 #include <aisystemuids.hrh>
@@ -999,7 +1001,9 @@
 //
 TBool CWmMainContainer::CanDoHelp()
     {
-    return FeatureManager::FeatureSupported( KFeatureIdHelp );
+	// we don't have a featuremanager, so we return false for the moment
+    // return FeatureManager::FeatureSupported( KFeatureIdHelp );
+	return false;
     }
 
 // ---------------------------------------------------------------------------
@@ -1285,8 +1289,10 @@
 void CWmMainContainer::HandleListBoxEventL(
         CEikListBox* /*aListBox*/, TListBoxEvent aEventType )
     {
-    if ( ( aEventType == EEventEnterKeyPressed ||
-           aEventType == EEventItemSingleClicked ) 
+	// S60v5 doesn't have EEventItemSingleClicked
+	if ( ( aEventType == EEventEnterKeyPressed ) 
+//    if ( ( aEventType == EEventEnterKeyPressed ||
+//           aEventType == EEventItemSingleClicked ) 
            && !iClosingDown )    
         {
         AddWidgetToHomeScreenL();

--- a/idlehomescreen/xmluirendering/uiengine/src/xnuiengine.rss	Thu Mar 18 14:57:41 2010 +0200
+++ b/idlehomescreen/xmluirendering/uiengine/src/xnuiengine.rss	Thu Mar 25 16:30:13 2010 +0100
@@ -28,7 +28,7 @@
 #include <avkon.rh>
 #include <avkon.mbg>
 #include <e32keys.h>
-#include <activeidle3.loc>
+#include <app/loc/sc/activeidle3.loc>
 // ========== RESOURCE DEFINITIONS ============================================
 
 RESOURCE RSS_SIGNATURE { }

--- a/idlehomescreen/xmluirendering/uiengine/src/xnwidgetextensionadapter.cpp	Thu Mar 18 14:57:41 2010 +0200
+++ b/idlehomescreen/xmluirendering/uiengine/src/xnwidgetextensionadapter.cpp	Thu Mar 25 16:30:13 2010 +0100
@@ -274,7 +274,16 @@
                         // we pass the event to it after
                         // recalculating the taping point
                         TPointerEvent newPointerEvent;
-                        newPointerEvent.Copy( aPointerEvent );
+						// Copy is not yet defined in S60v5, do it manually
+                        //newPointerEvent.Copy( aPointerEvent );
+						newPointerEvent.iType=aPointerEvent.iType;
+						// Clear the advanced pointer flag EModifierAdvancedPointerEvent = 0x10000000
+						newPointerEvent.iModifiers=(aPointerEvent.iModifiers&~0x10000000);
+						// not needed, will be overwritten below
+						// newPointerEvent.iPosition=aPointerEvent.iPosition;
+						newPointerEvent.iParentPosition=aPointerEvent.iParentPosition;
+						// end copy
+						
                         newPointerEvent.iPosition = TPoint(
                                  aPointerEvent.iParentPosition - clientRect.iTl );
                         parentN->Control()->HandlePointerEventL( newPointerEvent );