diff -r 41a7f70b3818 -r 5266b1f337bd phoneapp/phoneuicontrol/group/phoneuicontrol.mmp
--- a/phoneapp/phoneuicontrol/group/phoneuicontrol.mmp	Tue Aug 31 15:14:29 2010 +0300
+++ b/phoneapp/phoneuicontrol/group/phoneuicontrol.mmp	Wed Sep 01 12:30:10 2010 +0100
@@ -19,10 +19,7 @@
 #include <platform_paths.hrh>
 
 // Capability assignment.
-// <-- QT PHONE START --> 
-CAPABILITY CAP_GENERAL_DLL
-//CAPABILITY CAP_APPLICATION MultiMediaDD NetworkControl PowerMgmt DRM DiskAdmin
-// <-- QT PHONE END --> 
+CAPABILITY CAP_APPLICATION MultiMediaDD NetworkControl PowerMgmt DRM DiskAdmin
 
 // Assign Vendor ID.
 VENDORID VID_DEFAULT
@@ -50,26 +47,23 @@
 SOURCE          cphonestatestartup.cpp
 SOURCE          cphonesystemeventhandler.cpp
 SOURCE          cphoneuicontroller.cpp
+SOURCE          cphonekeyeventforwarder.cpp
 SOURCE          cphoneaccessorybthandler.cpp
 SOURCE          tphonecallheaderparam.cpp
 SOURCE          cphonecallheadermanager.cpp 
 SOURCE          cphonenumberentrymanager.cpp
-SOURCE          cphonecbamanager.cpp 
+SOURCE          cphonecbamanager.cpp
+SOURCE          cphonesecuritymodeobserver.cpp
 
 /* Languages */
 LANG SC
 
-
 USERINCLUDE     ../inc
-// <-- QT PHONE START --> 
-USERINCLUDE     ../../phoneuiqtviewadapter/inc
-//USERINCLUDE     ../../phoneuiview/inc
-// <-- QT PHONE END --> 
+USERINCLUDE     ../../phoneuiview/inc
 USERINCLUDE     ../../phoneuiutils/inc
-USERINCLUDE     ../../phoneui2/srcdata
+USERINCLUDE     ../../phoneui/srcdata
 USERINCLUDE     ../../phoneuistates/inc
 USERINCLUDE     ../../phonemediatorcenter/inc
-USERINCLUDE     ../../phoneuiutils/inc
 
 APP_LAYER_SYSTEMINCLUDE         // Application layer domain APIs
 SYSTEMINCLUDE   ../../../inc    // Telephony internal headers
@@ -81,14 +75,13 @@
 LIBRARY         engineinfo.lib
 LIBRARY         ws32.lib 
 LIBRARY         fbscli.lib
-// <-- QT PHONE START --> 
-LIBRARY         phonestringloader.lib
-//LIBRARY         commonengine.lib //StringLoader 
-// <-- QT PHONE END --> 
+LIBRARY         commonengine.lib //StringLoader 
 LIBRARY         featmgr.lib // FeatureManager
 LIBRARY         connmon.lib // RConnectionMonitor
 LIBRARY         avkon.lib // AknTextUtils
+LIBRARY         ProfileEngine.lib
 LIBRARY         hal.lib
+LIBRARY         eikcoctl.lib 
 
 // RemCon
 LIBRARY         remconcoreapi.lib
@@ -96,6 +89,7 @@
 LIBRARY         phonecmdhandler.lib
 // Soft reject
 LIBRARY         eikcore.lib // CCharFormatLayer, CParaFormatLayer
+LIBRARY         sendui.lib // CMessageData
 
 // Profiles
 LIBRARY         profileeng.lib
@@ -109,3 +103,5 @@
 LIBRARY         starterclient.lib
 
 LIBRARY         phonemediatorcenter.lib
+
+LIBRARY         peninputclient.lib