--- a/symbian4/mw/searchsrv/package_definition.xml	Tue Jun 29 12:34:13 2010 +0100
+++ b/symbian4/mw/searchsrv/package_definition.xml	Wed Jun 30 17:34:43 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
@@ -83,11 +83,6 @@
 <component name="searchserver" long-name="Search Server" filter="s60" introduced="^4">
 <unit bldFile="/sf/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="/sf/mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-<unit bldFile="/sf/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">
@@ -103,8 +98,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="/sf/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="/sf/mw/searchsrv/qcpix" proFile="qcpixsearchclient.pro"/>
 </component>
 </collection>
 <collection name="searchsrv_info" long-name="Search Services Info">