--- a/symbian4/mw/searchsrv/package_definition.xml	Wed Jun 30 11:44:37 2010 +0100
+++ b/symbian4/mw/searchsrv/package_definition.xml	Wed Jun 30 12:52:02 2010 +0100
@@ -33,7 +33,7 @@
        <component id="searchserver" name="Search Server" filter="s60" introduced="^4">
 			<unit bldFile="searcher/SearchServer/group"/>
        </component>
-       <component id="searcher_test" name="Searcher Tests" filter="s60" purpose="development" introduced="^4">
+       <component id="searcher_test" name="Searcher Tests" filter="s60,test" purpose="development" introduced="^4">
 			<!-- #include from common bld.inf or split into two components -->
 			<unit bldFile="searcher/tsrc/RobustnessTest/group"/>
 			<unit bldFile="searcher/tsrc/LogPlayer/group"/>
@@ -52,9 +52,19 @@
 			<unit bldFile="WatchDog/group"/>
        </component>
     </collection>
-   <collection id="qcpix" name="Qt CPIX" level="engine">     
-    <component id="qcpix_build" name="Qt CPIX Build" introduced="^4">
-      <unit bldFile="qcpix"  qt:proFile="qcpix.pro"/>
+    <collection id="qcpix" name="Qt CPIX" level="engine">     
+     <component id="qcpixsearchclient" name="Qt CPIX Search Client" introduced="^4">
+    	<!-- Snag! qcpix.pro and qcpixsearchclient.pro in same directory! -->
+      <unit bldFile="qcpix"  qt:proFile="qcpixsearchclient.pro"/>
+     </component>
+     <component id="qsamplesearch" name="Qt CPIX Sample Search" filter="test" introduced="^4">
+      <unit bldFile="qcpix/tsrc/SampleSearch"  qt:proFile="SampleSearch.pro"/>
+     </component>
+     <component id="orbitsearch" name="Qt CPIX Orbit Search" filter="test" introduced="^4">
+      <unit bldFile="qcpix/tsrc/orbitsearch"  qt:proFile="orbitsearch.pro"/>
+     </component>
+     <component id="qcpixunittests" name="Qt CPIX Unit Tests" filter="test" introduced="^4">
+      <unit bldFile="qcpix/tsrc/qtcpixunittests"  qt:proFile="qtcpixunittests.pro"/>
      </component>
     </collection>
     <collection id="searchsrv_info" name="Search Services Info">