From 520780e1655a4855dbfc1ababd1925686a20960d Mon Sep 17 00:00:00 2001
From: Frans Englich <frans.englich@nokia.com>
Date: Wed, 26 Aug 2009 11:30:44 +0200
Subject: Rename mediaplayer to qmediaplayer, and make it an example on
 Symbian.

We rename mediaplayer to qmediaplayer to avoid it clashing with Symbian's
default media player. We also install it as an example, in order to be able to
show case Phonon.
---
 demos/embedded/fluidlauncher/config_s60/config.xml |  7 +++++++
 demos/embedded/fluidlauncher/fluidlauncher.pro     | 14 ++++++++++++--
 demos/mediaplayer/mediaplayer.pro                  |  2 +-
 demos/qtdemo/xml/examples.xml                      |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/demos/embedded/fluidlauncher/config_s60/config.xml
index 95e96bd..acd14cb 100644
--- a/demos/embedded/fluidlauncher/config_s60/config.xml
+++ b/demos/embedded/fluidlauncher/config_s60/config.xml
@@ -14,6 +14,13 @@
     <example filename="drilldown" name="Drilldown" image="screenshots/drilldown_s60.png"/>
     <example filename="softkeys" name="Softkeys" image="screenshots/softkeys_s60.png"/>
     <example filename="anomaly" name="Anomaly Browser" image="screenshots/anomaly_s60.png"/>
+    <example filename="raycasting" name="Ray casting" image="screenshots/raycasting.png"/>
+    <example filename="lightmaps" name="OpenStreetMap" image="screenshots/lightmaps.png"/>
+    <example filename="flightinfo" name="Flight Info" image="screenshots/flightinfo_s60.png"/>
+    <example filename="weatherinfo" name="Weather Info" image="screenshots/weatherinfo.png"/>
+    <example filename="flickable" name="Kinetic Scrolling" image="screenshots/flickable.png"/>
+    <example filename="digiflip" name="Flipping Clock" image="screenshots/digiflip.png"/>
+    <example filename="qmediaplayer" name="Media Player" image="screenshots/mediaplayer.png"/>
   </demos>
   <slideshow timeout="60000" interval="10000">
     <imagedir dir="slides"/>
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro
index 3eff37b..892a4ba 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.pro
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro
@@ -92,9 +92,14 @@ symbian {
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/fridgemagnets_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/drilldown_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/softkeys_reg.rsc
+
     contains(QT_CONFIG, webkit) {
         reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc
-        }
+    }
+
+    contains(QT_CONFIG, phonon) {
+        reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/qmediaplayer_reg.rsc
+    }
 
     reg_resource.path = $$REG_RESOURCE_IMPORT_DIR
 
@@ -110,11 +115,16 @@ symbian {
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/drilldown.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc \
+
     contains(QT_CONFIG, webkit) {
         resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc
         }
 
+    contains(QT_CONFIG, phonon) {
+        resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qmediaplayer.rsc
+    }
+
     resource.path = $$APP_RESOURCE_DIR
 
     mifs.sources = \
diff --git a/demos/mediaplayer/mediaplayer.pro b/demos/mediaplayer/mediaplayer.pro
index ef07a3f..8e38c0c 100644
--- a/demos/mediaplayer/mediaplayer.pro
+++ b/demos/mediaplayer/mediaplayer.pro
@@ -3,7 +3,7 @@
 ######################################################################
 
 TEMPLATE = app
-TARGET = 
+TARGET = qmediaplayer
 DEPENDPATH += . build src ui
 
 QT += phonon
diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml
index 6c8ddb0..ed04198 100644
--- a/demos/qtdemo/xml/examples.xml
+++ b/demos/qtdemo/xml/examples.xml
@@ -16,7 +16,7 @@
     <example filename="embeddeddialogs" name="Embedded Dialogs" />
     <example filename="interview" name="Interview" />
     <example filename="browser" name="Browser" />
-    <example filename="mediaplayer" name="Media Player" />
+    <example filename="qmediaplayer" name="Media Player" />
     <example filename="boxes" name="Boxes" />
     <example filename="sub-attaq" name="Sub-attaq" />
   </demos>
-- 
cgit v0.12