diff -r e686773b3f54 -r 0ba2181d7c28 phonebookengines/contactsmodel/groupsql/cntplsql.mmp
--- a/phonebookengines/contactsmodel/groupsql/cntplsql.mmp	Tue Feb 02 10:12:17 2010 +0200
+++ b/phonebookengines/contactsmodel/groupsql/cntplsql.mmp	Fri Mar 19 09:27:18 2010 +0200
@@ -1,21 +1,23 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// cntplsql.dll
-// cntplsql.dll Contacts engine persistence layer (no client interface)
-// 
-//
+/*
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+* cntplsql.dll
+* cntplsql.dll Contacts engine persistence layer (no client interface)
+*
+*/
 
+#include <platform_paths.hrh>
 #include "cntmodel.mmh"
 
 target          cntplsql.dll
@@ -26,13 +28,24 @@
 
 //MACRO __PROFILE_DEBUG__
 
+APP_LAYER_SYSTEMINCLUDE
 
-userinclude ../src //for cntstd.h 
-userinclude ../cntsrv/inc //for persistencelayer.h 
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+USERINCLUDE	 		../src //for cntstd.h 
+USERINCLUDE	 		../cntsrv/inc //for persistencelayer.h
+USERINCLUDE	 		../cntplsql/inc 
+USERINCLUDE	 		../inc	//for ccontactprivate.h
 
-userinclude 	../cntplsql/inc 
-userinclude 	../inc			//for ccontactprivate.h
+// Qt Macros
+MACRO		UNICODE
+MACRO		QT_KEYPAD_NAVIGATION
+MACRO		QT_SOFTKEYS_ENABLED
+MACRO		HB_EFFECTS
+MACRO		QT_NO_DEBUG
+MACRO		QT_SVG_LIB
+MACRO		QT_GUI_LIB
+MACRO		QT_NETWORK_LIB
+MACRO		QT_CORE_LIB
+MACRO		QT_WARNING_FILE_OUTPUT
 
 SOURCEPATH	../cntplsql/src
 source		cntsqlprovider.cpp 
@@ -41,6 +54,7 @@
 source		cpplcontacttable.cpp
 source		cpplgroupstable.cpp
 source		cpplcommaddrtable.cpp
+source		cpplpredictivesearchtable.cpp
 
 source 		pplcontactitemmanager.cpp
 source		rpplicccontactstore.cpp
@@ -59,15 +73,25 @@
 source      cntpplviewmanager.cpp
 source      cntpplviewsession.cpp
 
+source    cpcskeymap.cpp
+//source		cntmetadataoperation.cpp
+source    cpplpresencetable.cpp
 
-library         euser.lib 
-library         efsrv.lib 
-library         estor.lib 
-library         ecom.lib 
-library         bafl.lib
-library         cntmodel.lib
-library			sqldb.lib
+LIBRARY         euser.lib 
+LIBRARY         efsrv.lib 
+LIBRARY         estor.lib 
+LIBRARY         ecom.lib 
+LIBRARY         bafl.lib
+LIBRARY         cntmodel.lib
+LIBRARY			sqldb.lib
+LIBRARY			HbCore.lib
+LIBRARY			qtcore.lib
+LIBRARY     	libstdcppv5.lib
+LIBRARY     	libc.lib
+LIBRARY     	libm.lib
 
-SMPSAFE
+OPTION ARMCC --visibility_inlines_hidden
 
-
+EPOCALLOWDLLDATA
+STDCPP
+SMPSAFE