--- a/controlpanel/tsrc/unit/ut_cpapi/ut_cpapi.pro	Fri Jun 25 17:09:30 2010 +0800
+++ b/controlpanel/tsrc/unit/ut_cpapi/ut_cpapi.pro	Tue Aug 24 10:30:25 2010 +0800
@@ -1,51 +1,66 @@
-#
 # 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: 
-#
+# Description:
 
 TEMPLATE = app
 TARGET = ut_cpapi
 QT += testlib
 CONFIG += hb qtestlib
 CONFIG += symbian_test
-unix {
-    test.commands = /epoc32/RELEASE/WINSCW/udeb/ut_cpapi.exe
-    autotest.commands = /epoc32/RELEASE/WINSCW/udeb/ut_cpapi.exe -xml -o c:/ut_cpapi.xml
-} else:win32 {
-    test.CONFIG += recursive
-    autotest.CONFIG += recursive
-    build_pass {
-        test.commands =/epoc32/RELEASE/WINSCW/udeb/ut_cpapi.exe
-        autotest.commands =/epoc32/RELEASE/WINSCW/udeb/ut_cpapi.exe -xml -o c:/ut_cpapi.xml
-        }
-}
+
 QMAKE_EXTRA_TARGETS += test autotest
 
 DEPENDPATH += .
-
-INCLUDEPATH += . \
-							 src/\
-							 ../../../src/inc \
-							 ../../../controlpanel_plat/inc
-							 
+INCLUDEPATH += src/ \
+               ../../../src/inc \
+               ../../../controlpanel_plat/inc
 LIBS += -lcpframework
 
 # Input
-HEADERS += src/ut_cpapi.h
-SOURCES += src/ut_cpapi.cpp \ 
-            src/main.cpp
+HEADERS += src/ut_cpapi.h 
+HEADERS += src/cptestview.h 
+HEADERS += src/cptestpluginentryitem.h
+SOURCES += src/ut_cpapi.cpp
+SOURCES += src/cptestview.cpp 
+SOURCES += src/cptestpluginentryitem.cpp
 
-symbian {
-	BLD_INF_RULES.prj_exports += "data/controlpanellog.conf C:/data/.config/ut_cpapi/controlpanellog.conf"
+symbian*: { 
+    TARGET.CAPABILITY = CAP_APPLICATION
+    LIBS += -lfirstpluginfortest \
+           -lsecondpluginfortest \
+           -lthirdpluginfortest
+    deploy.path = C:
+    testdlls.sources += firstpluginfortest.dll secondpluginfortest.dll thirdpluginfortest.dll
+    testdlls.path = /sys/bin
+    
+    testqtplugins.sources += ../pluginfortest/firstpluginfortest/qmakepluginstubs/firstpluginfortest.qtplugin \
+                             ../pluginfortest/secondpluginfortest/qmakepluginstubs/secondpluginfortest.qtplugin \
+                             ../pluginfortest/thirdpluginfortest/qmakepluginstubs/thirdpluginfortest.qtplugin 
+    testqtplugins.path = /resource/qt/plugins/controlpanel                        
+    
+    DEPLOYMENT += testdlls testqtplugins
+}
+
+
+
+symbian:BLD_INF_RULES.prj_exports += "data/controlpanellog.conf C:/data/.config/ut_cpapi/controlpanellog.conf"
+
+unix { 
+    test.commands = /epoc32/RELEASE/WINSCW/udeb/ut_cpapi.exe
+    autotest.commands = /epoc32/RELEASE/WINSCW/udeb/ut_cpapi.exe -xml -o c:/ut_cpapi.xml
+}
+else:win32 { 
+    test.CONFIG += recursive
+    autotest.CONFIG += recursive
+    build_pass { 
+        test.commands = /epoc32/RELEASE/WINSCW/udeb/ut_cpapi.exe
+        autotest.commands = /epoc32/RELEASE/WINSCW/udeb/ut_cpapi.exe -xml -o c:/ut_cpapi.xml
+    }
 }
\ No newline at end of file