diff -r e679f6dbf329 -r 6f784b8f4999 symbian4/single/sysdefs/auto/system_model.xml
--- a/symbian4/single/sysdefs/auto/system_model.xml	Wed Jun 30 12:04:54 2010 +0100
+++ b/symbian4/single/sysdefs/auto/system_model.xml	Wed Jun 30 13:05:18 2010 +0100
@@ -4369,11 +4369,6 @@
 <component name="searchserver" long-name="Search Server" filter="s60" introduced="^4">
 <unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
 </component>
-<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development" introduced="^4">
-<!-- #include from common bld.inf or split into two components -->
-<unit bldFile="mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-<unit bldFile="mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
-</component>
 </collection>
 <collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
 <component name="searchsrv_pluginfw" long-name="Search Server" filter="s60" introduced="^4">
@@ -4389,8 +4384,9 @@
 </component>
 </collection>
 <collection name="qcpix" long-name="Qt CPIX" level="engine">
-<component name="qcpix_build" long-name="Qt CPIX Build" introduced="^4">
-<unit bldFile="mw/searchsrv/qcpix" proFile="qcpix.pro"/>
+<component name="qcpixsearchclient" long-name="Qt CPIX Search Client" introduced="^4">
+<!-- Snag! qcpix.pro and qcpixsearchclient.pro in same directory! -->
+<unit bldFile="mw/searchsrv/qcpix" proFile="qcpixsearchclient.pro"/>
 </component>
 </collection>
 <collection name="searchsrv_info" long-name="Search Services Info">