# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1274373566 -3600
# Node ID d0cf5c0dc8c7d827db7f2c809b601cc81ad10d15
# Parent  e41dd3a49da0edab08f117eb19f7b045f2cd77fb
Fixes for build problems in qt and homescreensrv

diff -r e41dd3a49da0 -r d0cf5c0dc8c7 symbian4/mw/homescreensrv/package_definition_3.0.xml
--- a/symbian4/mw/homescreensrv/package_definition_3.0.xml	Thu May 20 17:37:00 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition_3.0.xml	Thu May 20 17:39:26 2010 +0100
@@ -46,7 +46,7 @@
    <component id="contentharvester" filter="s60" name="Content Harvester">
     <unit bldFile="contentpublishingsrv/contentharvester/group"/>
    </component>
-   <component id="contentpublishingsrv_build" filter="s60" name="Content Publishing Service Build">
+   <component id="contentpublishingsrv_rom" filter="s60" name="Content Publishing Service ROM">
     <!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
       		If keeping, it need to move down a directory.-->
     <unit bldFile="contentpublishingsrv/group"/>
@@ -54,6 +54,9 @@
   </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="action_handler_plugin_api" name="Action Handler Plugin API" class="api" filter="s60">
     <meta rel="Api" href="homescreensrv_plat/action_handler_plugin_api/action_handler_plugin_api.metaxml"/>
     <unit base="homescreensrv_plat/action_handler_plugin_api"/>
@@ -62,10 +65,6 @@
     <meta rel="Api" href="homescreensrv_plat/content_harvester_plugin_api/content_harvester_plugin_api.metaxml"/>
     <unit base="homescreensrv_plat/content_harvester_plugin_api"/>
    </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="sapi_contentpublishing" name="SAPI Content Publishing" class="api" filter="s60">
     <meta rel="Api" href="homescreensrv_plat/sapi_contentpublishing/sapi_contentpublishing.metaxml"/>
     <unit base="homescreensrv_plat/sapi_contentpublishing"/>
@@ -74,6 +73,25 @@
     <meta rel="Api" href="homescreensrv_plat/sapi_actionhandler/sapi_actionhandler.metaxml"/>
     <unit base="homescreensrv_plat/sapi_actionhandler"/>
    </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="appruntimemodel_api" name="Appliction Run-Time Model API" class="api" filter="s60" introduced="^4">
+    <unit base="homescreensrv_plat/appruntimemodel_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="statemodel_api" name="State Model API" class="api" filter="s60" introduced="^4">
+    <unit base="homescreensrv_plat/statemodel_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="screensavermodel" name="Screensaver Model" level="specific">
      <component id="screensavermodel_build" name="Screensaver Model Build"  introduced="^4">
diff -r e41dd3a49da0 -r d0cf5c0dc8c7 symbian4/mw/qt/package_definition_3.0.xml
--- a/symbian4/mw/qt/package_definition_3.0.xml	Thu May 20 17:37:00 2010 +0100
+++ b/symbian4/mw/qt/package_definition_3.0.xml	Thu May 20 17:39:26 2010 +0100
@@ -10,25 +10,25 @@
     </collection>
     <collection id="qt_info" name="Qt Info" level="mw">
             <component id="qt_build" name="Qt Build" introduced="^2">
-  		        <unit bldFile="." qt:proFile="projects.pro" qt:qmakeArgs="-r"/>
+  		        <unit bldFile="." qt:proFile="projects.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
             </component>
     </collection>
     <collection id="qtdemos" name="Qt Demos" level="app">
             <component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="qtdemos">
-                <unit bldFile="demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
+                <unit bldFile="demos" qt:proFile="demos.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
             </component>
     </collection>
     <collection id="qtexamples" name="Qt Examples" level="app">
             <component id="qtexamples_build" name="Qt Examples Build" introduced="^2"  filter="qtexamples">
-                <unit bldFile="examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+                <unit bldFile="examples" qt:proFile="examples.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
             </component>
     </collection>
     <collection id="qt_tests" name="Qt Tests" level="app">
-            <component id="qttestsauto" name="Qt Automated Tests" introduced="^2"  filter="qttestsauto">
-                <unit bldFile="tests/auto"  qt:proFile="qtpauto.pro" qt:makeArgs="-r"/>
+            <component id="qttestsauto" name="Qt Automated Tests" introduced="^2"  filter="qttestsauto,test">
+                <unit bldFile="tests/auto"  qt:proFile="qtpauto.pro" qt:makeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
             </component>
-            <component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-                <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="-r"/>
+            <component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks,test">
+                <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
             </component>
     </collection>
   </package>