--- a/symbian4/mw/mmappfw/package_definition.xml	Sat Jun 26 14:31:58 2010 +0100
+++ b/symbian4/mw/mmappfw/package_definition.xml	Tue Jun 29 12:34:13 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
@@ -118,6 +118,9 @@
 <component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
 <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
 </component>
+<component name="qt_telephony_multimedia_service_api" long-name="Qt Telephony Multimedia Service API" introduced="^4" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmappfw/mmappfw_plat/qt_telephony_multimedia_service_api/group"/>
+</component>
 </collection>
 <collection name="mpx" long-name="Multimedia Player" level="fw">
 <component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
@@ -132,7 +135,7 @@
 <component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
 <unit bldFile="/sf/mw/mmappfw/mpx/viewframework/group"/>
 </component>
-<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
+<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60" introduced="^4">
 <unit bldFile="/sf/mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
 </component>
 <component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
@@ -162,12 +165,10 @@
 <unit bldFile="/sf/mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
 </component>
 <component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
+<unit bldFile="/sf/mw/mmappfw/mmappcomponents/audiofetcher/group"/>
 </component>
 <component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
+<unit bldFile="/sf/mw/mmappfw/mmappcomponents/asxparser/group"/>
 </component>
 <component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
 <unit bldFile="/sf/mw/mmappfw/mmappcomponents/playbackhelper/group"/>
@@ -179,6 +180,12 @@
 <unit bldFile="/sf/mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
 </component>
 </collection>
+<collection name="qtms" long-name="Qt Telephony Multimedia Services" level="fw">
+<component name="qtms_build" filter="s60" long-name="Qt Telephony Multimedia Services Build" introduced="^4">
+<!--  Collection is really a component. Move down a dir -->
+<unit bldFile="/sf/mw/mmappfw/qtms" proFile="qtmsapi.pro" qmakeArgs="-r -config rom"/>
+</component>
+</collection>
 <collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
 <component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
 <!--  Move the export to another component or remove the #includes from this one -->