Update the symbian4\config copy of bldpublic.hrh
Remove the spurious *StaticFeatures.hrh files
<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
<package id="homescreensrv" name="Home Screen Services" levels="plugin framework server generic specific">
<collection id="hswidgetmodel" name="Home Screen Widget Model" level="framework">
<component id="hswidgetmodel_build" name="Home Screen Widget Model Build" introduced="^4">
<unit bldFile="hswidgetmodel" qt:qmakeArgs="-r" qt:proFile="hswidgetmodel.pro"/>
</component>
</collection>
<collection id="contentstorage" name="Content Storage" level="framework">
<component id="cautils" name="Content Arsenal Utils" introduced="^4">
<unit bldFile="contentstorage/cautils" qt:qmakeArgs="-r" qt:proFile="cautils.pro"/>
</component>
<component id="contentstorage_build" name="Content Storage Build" introduced="^4">
<unit bldFile="contentstorage/group" qt:qmakeArgs="-r" qt:proFile="group.pro"/>
</component>
<component id="casrv/calocalizerscanner" name="Content Arsenal Server Localizer Scanner" introduced="^4">
<unit bldFile="contentstorage/casrv/calocalizerscanner" qt:qmakeArgs="-r" qt:proFile="calocalizerscanner.pro"/>
</component>
<component id="cahandler" name="Content Arsenal Handler" introduced="^4">
<unit bldFile="contentstorage/cahandler" qt:qmakeArgs="-r" qt:proFile="cahandler.pro"/>
</component>
<component id="caclient" name="Content Arsenal Client" introduced="^4">
<unit bldFile="contentstorage/caclient" qt:qmakeArgs="-r" qt:proFile="caclient.pro"/>
</component>
<component id="casoftwareregistry" name="Content Arsenal Software Registry" introduced="^4">
<unit bldFile="contentstorage/casoftwareregistry" qt:qmakeArgs="-r" qt:proFile="casoftwareregistry.pro"/>
</component>
</collection>
<collection id="homescreensrv_plat" name="Home Screen Services Platform Interfaces" level="specific">
<component id="homescreensrv_plat_build" name="Home Screen Services Platform Interfaces build" introduced="^4">
<unit bldFile="homescreensrv_plat" qt:qmakeArgs="-r" qt:proFile="homescreensrv_plat.pro"/>
</component>
<component id="menu_sat_interface_api" name="Menu SAT Interface API" class="api" filter="s60">
<meta rel="Api" href="homescreensrv_plat/menu_sat_interface_api/menu_sat_interface_api.metaxml"/>
<unit base="homescreensrv_plat/menu_sat_interface_api"/>
</component>
<component id="contentstorage_api" name="Content Storage API" class="api" filter="s60" introduced="^4">
<unit base="homescreensrv_plat/contentstorage_api"/>
</component>
<component id="hswidgetmodel_api" name="HS Widget Model API" class="api" filter="s60" introduced="^4">
<unit base="homescreensrv_plat/hswidgetmodel_api"/>
</component>
<component id="homescreen_information_api" name="Homescreen Information API" class="api" filter="s60" introduced="^4">
<unit base="homescreensrv_plat/homescreen_information_api"/>
</component>
</collection>
<collection id="hsactivityfw" name="Activity Framework" level="fw">
<component id="hsactivityfw_build" name="Activity Framework Build" introduced="^4">
<unit bldFile="activityfw" qt:qmakeArgs="-r" qt:proFile="activityfw.pro"/>
</component>
</collection>
<collection id="tstaskmonitor" name="Task Switcher Task Monitor" level="fw">
<!-- move collection down to a component directory or split up into component .pro files -->
<component id="tstaskmonitor_build" name="Task Switcher Task Monitor Build" introduced="^4">
<unit bldFile="tstaskmonitor" qt:qmakeArgs="-r" qt:proFile="tstaskmonitor.pro"/>
</component>
</collection>
<collection id="hsappkeyhandler" name="HS Appplication Key Handler" level="server">
<component id="hsappkeyhandler_build" name="Appplication Key Handler Build" introduced="^4">
<unit bldFile="hsappkeyhandler" qt:qmakeArgs="-r" qt:proFile="hsappkeyhandler.pro"/>
</component>
</collection>
<collection id="tsdevicedialog" name="Task Switcher Device Dialog" level="plugin">
<component id="tsdevicedialog_build" name="Task Switcher Device Dialog Build" introduced="^4">
<!-- break this up into real components -->
<unit bldFile="tsdevicedialog" qt:qmakeArgs="-r" qt:proFile="tsdevicedialog.pro"/>
</component>
</collection>
<collection id="homescreensrv_info" name="Home Screen Services Info" level="specific">
<component id="homescreensrvconf" name="Home Screen Services Config" class="config" introduced="^4">
<unit bldFile="." qt:qmakeArgs="-r" qt:proFile="homescreensrv_exports_to_rom.pri"/>
</component>
<component id="homescreensrvrom" name="Home Screen Services ROM" introduced="^4">
<unit bldFile="group"/>
</component>
<component id="homescreensrv_test" name="Home Screen Services Test" filter="test,unit_test" introduced="^4">
<unit bldFile="tsrc" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN" qt:proFile="tsrc.pro"/>
</component>
</collection>
</package>
</SystemDefinition>