--- a/symbian4/app/videoplayer/package_definition.xml	Wed Jun 30 13:21:56 2010 +0100
+++ b/symbian4/app/videoplayer/package_definition.xml	Wed Jun 30 15:34:41 2010 +0100
@@ -11,7 +11,11 @@
   </collection>
   <collection id="videocollection" name="Video Collection" level="util">
    <component id="mpxmyvideoscollection" filter="s60" name="MPX My Videos Collection" introduced="^3">
-    <unit bldFile="videocollection/mpxmyvideoscollection/group"/>
+	  <meta rel="testbuild">
+		<group name="vado.101_mpxmyvideoscollection_tsrc"/>
+       </meta>
+    <unit bldFile="videocollection/mpxmyvideoscollection/group" filter="!test"/>
+    <unit bldFile="videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/group" filter="test,unit_test"/>
    </component>
    <component id="videocollectionwrapper" filter="s60" name="Video Collection Wrapper" introduced="^4">
     <unit bldFile="videocollection/videocollectionwrapper" qt:proFile="videocollectionwrapper.pro" qt:qmakeArgs="-r"/>
@@ -19,7 +23,7 @@
      <component id="videocollectionwrapper_test" filter="test,qt_unit_test" name="Video Collection Wrapper Tests" introduced="^4">
       <!--Can only have one unit. Need to split into separate component or #include from a common file-->
       <meta rel="testbuild">
-       <group name="vado.videocollection.tsrc"/>
+       <group name="vado.101_videocollection_qt.tsrc"/>
       </meta>
       <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideocollectionclient" qt:proFile="testvideocollectionclient.pro"/>
       <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideocollectionlistener" qt:proFile="testvideocollectionlistener.pro"/>
@@ -39,7 +43,7 @@
     <component id="videocollectionview_test" filter="test,qt_unit_test" name="Video Collection View Tests">
       <!--Can only have one unit. Need to split into separate components or #include from a common file-->
       <meta rel="testbuild">
-       <group name="vado.videocollection.tsrc"/>
+       <group name="vado.101_videocollection_qt.tsrc"/>
       </meta>
       <unit bldFile="videocollection/videocollectionview/tsrc/testcollectionview" qt:proFile="testcollectionview.pro"/>
       <unit bldFile="videocollection/videocollectionview/tsrc/testhintwidget" qt:proFile="testhintwidget.pro"/>
@@ -54,17 +58,19 @@
    </component>
   </collection>
   <collection id="mediasettings" name="Media Settings" level="support">
-   <!--  this is really a component. Should be moved down a directory -->
-   <component id="mediasettings_build" filter="s60" name="Media Settings Build">
-    <unit bldFile="mediasettings/group"/>
+   <component id="mediasettingsengine" filter="s60" name="Media Settings Engine">
+    <unit bldFile="mediasettings/mediasettingsengine/group"/>
+   </component>
+   <component id="videosettingsplugin" filter="s60" name="Video Settings Plugin" class="plugin">
+    <!--<unit bldFile="mediasettings/videosettingsplugin" qt:proFile="videosettingsplugin.pro"/> -->
    </component>
   </collection>
   <collection id="videoplayerapp" name="Video Player App" level="apps">
    <component id="videoplayerengine" name="Video Player Engine" filter="s60"  introduced="^4">
     <unit bldFile="videoplayerapp/videoplayerengine" qt:proFile="videoplayerengine.pro" qt:qmakeArgs="-r"/>
    </component>
-   <component id="hbvideoplayer" filter="s60" name="HB Video Player" introduced="^4">
-    <unit bldFile="videoplayerapp/hbvideoplayer" qt:proFile="hbvideoplayer.pro" qt:qmakeArgs="-r"/>
+   <component id="hbvideoplayer" filter="s60" name="Video Player" introduced="^4">
+    <unit bldFile="videoplayerapp/videoplayer" qt:proFile="videoplayer.pro" qt:qmakeArgs="-r"/>
    </component>
   </collection>
   <collection id="videoplayback" name="Video Playback Plugins" level="plugin">
@@ -75,9 +81,12 @@
     <unit bldFile="videoplayback/hbvideoplaybackviewplugin"  qt:proFile="hbvideoplaybackviewplugin.pro" qt:qmakeArgs="-r"/>
    </component>
    <component id="videohelix" name="Video Helix" filter="s60" introduced="^3" class="plugin">
-    <unit bldFile="videoplayback/videohelix/group"/>
+	  <meta rel="testbuild">
+		<group name="vado.101_videoplayback_tsrc"/>
+       </meta>
+    <unit bldFile="videoplayback/videohelix/group" filter="!test"/>
+    <unit bldFile="videoplayback/videohelix/tsrc/ut_videohelixtest/group" filter="test,unit_test"/>
    </component>
   </collection>
  </package>
 </SystemDefinition>
-