--- a/piprofilerui/group/bld_generic.inf	Wed Sep 01 12:30:35 2010 +0100
+++ b/piprofilerui/group/bld_generic.inf	Tue Sep 14 21:20:12 2010 +0300
@@ -16,19 +16,5 @@
 */
 
 PRJ_MMPFILES
-#ifndef SBSV2
-  #ifdef MARM
-  gnumakefile piprofiler_stub_sis.mk
-  #endif
-#endif
+PRJ_EXTENSIONS
 
-PRJ_EXTENSIONS
-#ifdef SBSV2
-  #ifdef MARM
-  START EXTENSION app-services/buildstubsis
-  OPTION SRCDIR ../sis
-  OPTION SISNAME PIProfiler_stub
-  END
-  #endif  
-#endif
-

--- a/piprofilerui/ui/avkon/data/piprofilerui.rss	Wed Sep 01 12:30:35 2010 +0100
+++ b/piprofilerui/ui/avkon/data/piprofilerui.rss	Tue Sep 14 21:20:12 2010 +0300
@@ -480,7 +480,7 @@
             id = EAknMessageQueryContentId;
             control = AVKON_MESSAGE_QUERY
                 {
-               	message = "Version 2.2.0.2 - 4th May 2010. Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.";
+               	message = "Version 2.2.1 - 10th August 2010. Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.";
                 };
             }
         };

--- a/piprofilerui/ui/avkon/rom/piprofilerui_avkon.iby	Wed Sep 01 12:30:35 2010 +0100
+++ b/piprofilerui/ui/avkon/rom/piprofilerui_avkon.iby	Tue Sep 14 21:20:12 2010 +0300
@@ -30,7 +30,4 @@
   S60_APP_AIF_RSC(PIProfilerUI)
 #endif
 
-data=ZPRIVATE\2001E5AE\backup_registration.xml        	private\2001E5AE\backup_registration.xml
-data=ZSYSTEM\Install\PIProfilerUI_stub.sis              system\install\PIProfilerUI_stub.sis
-
 #endif // __PROFILERGUI_IBY__

--- a/piprofilerui/ui/hb/hb.pro	Wed Sep 01 12:30:35 2010 +0100
+++ b/piprofilerui/ui/hb/hb.pro	Tue Sep 14 21:20:12 2010 +0300
@@ -55,7 +55,7 @@
     
 	TARGET.CAPABILITY = ALL -TCB
 
-	LIBS += -lcharconv -lbafl -lsysutil
+	LIBS += -lcharconv -lbafl -lsysutil -lefsrv
     
     ICON = ../icons/qgn_menu_piprofilerui.svg 
     

--- a/piprofilerui/ui/hb/inc/notifications.h	Wed Sep 01 12:30:35 2010 +0100
+++ b/piprofilerui/ui/hb/inc/notifications.h	Tue Sep 14 21:20:12 2010 +0300
@@ -18,7 +18,7 @@
 #ifndef NOTIFICATIONS_H_
 #define NOTIFICATIONS_H_
 
-#include <qstring> 
+#include <QString> 
 
 /**
  * Notifications class for viewing notification messages.

--- a/piprofilerui/ui/hb/inc/pimainwindow.h	Wed Sep 01 12:30:35 2010 +0100
+++ b/piprofilerui/ui/hb/inc/pimainwindow.h	Tue Sep 14 21:20:12 2010 +0300
@@ -19,7 +19,7 @@
 #define PIPROFILERMAINWINDOW_H_
 
 // System includes
-#include <QObject.h>
+#include <qobject.h>
 #include <hbmainwindow.h>
 
 // User includes

--- a/piprofilerui/ui/hb/rom/piprofilerui_hb.iby	Wed Sep 01 12:30:35 2010 +0100
+++ b/piprofilerui/ui/hb/rom/piprofilerui_hb.iby	Tue Sep 14 21:20:12 2010 +0300
@@ -27,7 +27,4 @@
 //S60_APP_RESOURCE(PIProfilerUI)
 data=ZPRIVATE\10003a3f\import\apps\PIProfilerUI_reg.rsc private\10003a3f\import\apps\PIProfilerUI_reg.rsc
 
-data=ZPRIVATE\2001E5AE\backup_registration.xml        	private\2001E5AE\backup_registration.xml
-data=ZSYSTEM\Install\PIProfilerUI_stub.sis              system\install\PIProfilerUI_stub.sis
-
 #endif // __PROFILERGUI_IBY__

--- a/piprofilerui/ui/hb/src/pimainview.cpp	Wed Sep 01 12:30:35 2010 +0100
+++ b/piprofilerui/ui/hb/src/pimainview.cpp	Tue Sep 14 21:20:12 2010 +0300
@@ -89,7 +89,6 @@
     loadItemsFromResources(loader);
 
     // Set list widget items
-    mListPlugins->setLongPressEnabled(true);
     mListPlugins->setClampingStyle(HbScrollArea::BounceBackClamping);
     mListPlugins->setFrictionEnabled(true);
 
@@ -187,7 +186,7 @@
 void PIMainView::showAboutPopup()
 {
 
-    Notifications::showMessageBox("Version 2.2.0.2 - 4th May 2010. \n"
+    Notifications::showMessageBox("Version 2.2.1 - 10th August 2010. \n"
             "Copyright © 2010 Nokia Corporation "
             "and/or its subsidiary(-ies). "
             "All rights reserved.");

--- a/piprofilerui/ui/hb/src/pisettingsview.cpp	Wed Sep 01 12:30:35 2010 +0100
+++ b/piprofilerui/ui/hb/src/pisettingsview.cpp	Tue Sep 14 21:20:12 2010 +0300
@@ -15,18 +15,18 @@
  *
  */
 
-#include <hbmainwindow>
-#include <hbdataform>
-#include <hbdataformmodel>
-#include <hbdataformmodelitem>
-#include <hbdataformviewitem>
-#include <qgraphicslinearlayout>
-#include <qvalidator>
-#include <qintvalidator>
-#include <qmodelindex>
-#include <hblineedit>
-#include <hbvalidator>
-#include <hbeditorinterface>
+#include <HbMainWindow>
+#include <HbDataForm>
+#include <HbDataFormModel>
+#include <HbDataFormModelItem>
+#include <HbDataFormViewItem>
+#include <QGraphicsLinearLayout>
+#include <QValidator>
+#include <QIntValidator>
+#include <QModelIndex>
+#include <HbLineEdit>
+#include <HbValidator>
+#include <HbEditorInterface>
 #include <hbabstractitemview.h>
 
 #include "pisettingsview.h"