--- a/phonebookengines/cntlistmodel/cntlistmodel.pro	Wed Aug 11 09:06:35 2010 +0300
+++ b/phonebookengines/cntlistmodel/cntlistmodel.pro	Mon Aug 23 16:06:28 2010 +0300
@@ -1,30 +1,18 @@
-#
 # Copyright (c) 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:
-#
-#
-
-
 TEMPLATE = lib
 TARGET = cntlistmodel
+DEFINES += dll \
+    BUILD_CNTLISTMODEL
 
-DEFINES += dll \
-    BUILD_CNTLISTMODEL 
-    
 MOC_DIR = moc
 
 CONFIG += hb
@@ -37,46 +25,45 @@
 INCLUDEPATH += inc
 INCLUDEPATH += ../../inc
 
-
-INTERNAL_PUBLIC_HEADERS += \
-        inc/cntlistmodelglobal.h \
-        inc/cntlistmodel.h    
+INTERNAL_PUBLIC_HEADERS += inc/cntlistmodelglobal.h \
+    inc/cntlistmodel.h
 
 HEADERS += $$INTERNAL_PUBLIC_HEADERS \
-           inc/cntlistmodel_p.h \
-           inc/cntcache.h \
-           inc/cntcache_p.h \
-           inc/cntinfoprovider.h \
-           inc/cntdefaultinfoprovider.h \
-           inc/cntpresenceinfoprovider.h \
-           ../../inc/cntdebug.h
+    inc/cntlistmodel_p.h \
+    inc/cntcache.h \
+    inc/cntcache_p.h \
+    inc/cntdefaultinfoprovider.h \
+    inc/cntpresenceinfoprovider.h \
+    inc/cntdisplaytextformatter.h \
+    ../../inc/cntdebug.h
 
 SOURCES += src/cntlistmodel.cpp \
-           src/cntcache.cpp \
-           src/cntcache_p.cpp \
-           src/cntdefaultinfoprovider.cpp \
-           src/cntpresenceinfoprovider.cpp
-    
+    src/cntcache.cpp \
+    src/cntcache_p.cpp \
+    src/cntdefaultinfoprovider.cpp \
+    src/cntpresenceinfoprovider.cpp \
+    src/cntdisplaytextformatter.cpp
+
 LIBS += -lQtContacts \
-        -lhbcore \
-        -lthumbnailmanagerqt \
-        -lpresencecacheqt \
-        -lxqsettingsmanager
-        
+    -lhbcore \
+    -lthumbnailmanagerqt \
+    -lpresencecacheqt \
+    -lxqsettingsmanager
+
 deploy.path = /
 headers.sources = $$INTERNAL_PUBLIC_HEADERS
-headers.path = /epoc32/include/app #change this to internal folder
+headers.path = /epoc32/include/app # change this to internal folder
 DEPLOYMENT += exportheaders
 
 # This is for new exporting system coming in garden
 for(header, headers.sources):BLD_INF_RULES.prj_exports += "$$header $$deploy.path$$headers.path/$$basename(header)"
 
-defBlock = \      
-	"$${LITERAL_HASH}if defined(EABI)" \
-		"DEFFILE  ../eabi/cntlistmodel.def" \
+:BLD_INF_RULES.prj_exports += "../../contacts_plat/contacts_ui_extensions_api/inc/cntinfoproviderfactory.h APP_LAYER_PLATFORM_EXPORT_PATH(cntinfoproviderfactory.h)"
+:BLD_INF_RULES.prj_exports += "../../contacts_plat/contacts_ui_extensions_api/inc/cntinfoprovider.h APP_LAYER_PLATFORM_EXPORT_PATH(cntinfoprovider.h)"
+
+defBlock = "$${LITERAL_HASH}if defined(EABI)" \
+    "DEFFILE ../eabi/cntlistmodel.def" \
     "$${LITERAL_HASH}else" \
-        "DEFFILE  ../bwins/cntlistmodel.def" \
-	"$${LITERAL_HASH}endif"
+    "DEFFILE ../bwins/cntlistmodel.def" \
+    "$${LITERAL_HASH}endif"
 MMP_RULES += defBlock
-
-