--- a/phoneapp/phoneuivoipextension/group/phoneuivoipextension.mmp	Tue Aug 31 15:14:29 2010 +0300
+++ b/phoneapp/phoneuivoipextension/group/phoneuivoipextension.mmp	Wed Sep 01 12:30:10 2010 +0100
@@ -23,10 +23,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 PowerMgmt NetworkControl DRM DiskAdmin
 
 // Assign Vendor ID.
 VENDORID VID_DEFAULT
@@ -51,33 +48,39 @@
 SOURCE          cphonemenuextensionwrapper.cpp
 SOURCE          cphoneextensionhandler.cpp
 SOURCE          tphonecmdparamselector.cpp
-// <-- QT PHONE START -->
-//SOURCE          tphonetouchpanewrapper.cpp
-// <-- QT PHONE END -->
+SOURCE          tphonetouchpanewrapper.cpp
 SOURCE          cphonetransferdialercontroller.cpp
 SOURCE          cphoneviewcustomizationvoip.cpp
 SOURCE          cphonestateutilsvoip.cpp
 SOURCE          cphoneunattendedtransfercmdhandler.cpp
-// <-- QT PHONE START -->
-//SOURCE          cphonevcchandler.cpp
-// <-- QT PHONE END -->
+SOURCE          cphonevcchandler.cpp
 SOURCE          cphonenewcallcmdhandler.cpp
 SOURCE          cphonecallforwardqueryhandler.cpp
 
-// <-- QT PHONE START -->
-/* Languages */
-/*LANG SC
+USERINCLUDE     ../inc
+USERINCLUDE     ../../phoneuicontrol/inc
+USERINCLUDE     ../../phoneuistates/inc
+USERINCLUDE     ../../phoneuiview/inc
+USERINCLUDE     ../../phoneui/inc
+USERINCLUDE     ../../phoneuiutils/inc
+USERINCLUDE     ../../phoneui/srcdata
+USERINCLUDE     ../../phoneui/loc
+
+APP_LAYER_SYSTEMINCLUDE         // Application layer domain APIs
+SYSTEMINCLUDE   ../../../inc    // Telephony internal headers
+
+
 
 #ifndef __SECURE_DATA__ 
+
+/* Languages */
+ LANG SC
 SOURCEPATH      ../srcdata
-
 // load protocol specific resources
 RESOURCE        phoneuivoip.rss
 #else
 // Resources
-
 SOURCEPATH      ../srcdata
-
 START RESOURCE  phoneuivoip.rss
 TARGETPATH APP_RESOURCE_DIR 
 HEADER
@@ -85,32 +88,11 @@
 END  // RESOURCE
 
 #endif // __SECURE_DATA__
-*/
-// <-- QT PHONE END -->
 
-USERINCLUDE     ../inc
-USERINCLUDE     ../../phoneuicontrol/inc
-USERINCLUDE     ../../phoneuistates/inc
-// <-- QT PHONE START -->
-USERINCLUDE     ../../phoneuiqtviewadapter/inc
-//USERINCLUDE     ../../phoneuiview/inc
-// <-- QT PHONE END -->
-USERINCLUDE     ../../phoneui/inc
-USERINCLUDE     ../../phoneuiutils/inc
-USERINCLUDE     ../../phoneui2/srcdata
-USERINCLUDE     ../../phoneui2/loc
-
-APP_LAYER_SYSTEMINCLUDE         // Application layer domain APIs
-SYSTEMINCLUDE   ../../../inc    // Telephony internal headers
 
 LIBRARY         bafl.lib
-// <-- QT PHONE START -->
-//LIBRARY         cch.lib 
-// <-- QT PHONE END -->
-// <-- QT PHONE START --> 
-LIBRARY         phonestringloader.lib
-//LIBRARY         commonengine.lib //StringLoader 
-// <-- QT PHONE END -->
+LIBRARY         cch.lib 
+LIBRARY         commonengine.lib //StringLoader 
 LIBRARY         cone.lib
 LIBRARY         ecom.lib
 LIBRARY         eikcoctl.lib // CEikMenuPane
@@ -124,8 +106,9 @@
 LIBRARY         phoneuiutils.lib
 LIBRARY         serviceprovidersettings.lib
 LIBRARY         serviceselector.lib
-// <-- QT PHONE START -->
-//LIBRARY         vccuipropertyhandler.lib //For VCC Usage
-// <-- QT PHONE END -->
+LIBRARY         vccuipropertyhandler.lib //For VCC Usage
 LIBRARY         ws32.lib
+LIBRARY         centralrepository.lib
+LIBRARY         phoneuiview.lib
+LIBRARY         aknskins.lib