Symbian fix: rename examples ftp and musicplayer to start with q.

Symbian already has the executables musicplayer.exe, mediaplayer.exe and
ftp.exe, with the result that we overwrite them with Qt. We solve this
by renaming the examples, and do it not only on Symbian, such that Qt
remains consistent across platforms.

This was previously partly done for mediaplayer. The folder name needs
to be consistent with the executable, for qtdemo to work. Done jointly
with Alessandro.

Task-number: QTBUG-4743

Reviewed-by: Alessandro Portale
Reviewed-by: Frans Englich

11 files changed, 8 insertions, 9 deletions

diff --git a/demos/demos.pro b/demos/demos.pro
index c4b88725d4..4a9d451e51 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -64,7 +64,7 @@ demos_arthurplugin.subdir = arthurplugin
 demos_sqlbrowser.subdir = sqlbrowser
 demos_undo.subdir = undo
 demos_qtdemo.subdir = qtdemo
-demos_mediaplayer.subdir = mediaplayer
+demos_mediaplayer.subdir = qmediaplayer
 
 demos_browser.subdir = browser
 
diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/demos/embedded/fluidlauncher/config_s60/config.xml
index fefa3ddb10..2c61baf48a 100644
--- a/demos/embedded/fluidlauncher/config_s60/config.xml
+++ b/demos/embedded/fluidlauncher/config_s60/config.xml
@@ -6,7 +6,7 @@
     <example filename="deform" name="Vector Deformation" image="screenshots/deform.png" args="-small-screen"/>
     <example filename="pathstroke" name="Path Stroking" image="screenshots/pathstroke.png" args="-small-screen"/>
     <example filename="wiggly" name="Wiggly Text" image="screenshots/wiggly_s60.png" args="-small-screen"/>
-    <example filename="ftp" name="Ftp Client" image="screenshots/ftp_s60.png"/>
+    <example filename="qftp" name="Ftp Client" image="screenshots/ftp_s60.png"/>
     <example filename="context2d" name="Context2d" image="screenshots/context2d_s60.png" args="-small-screen"/>
     <example filename="saxbookmarks" name="SaxBookmarks" image="screenshots/saxbookmarks_s60.png"/>
     <example filename="desktopservices" name="Desktop Services" image="screenshots/desktopservices_s60.png"/>
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro
index f2abde693b..dd931e61d0 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.pro
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro
@@ -66,7 +66,7 @@ symbian {
         deform.exe \
         pathstroke.exe \
         wiggly.exe \
-        ftp.exe \
+        qftp.exe \
         saxbookmarks.exe \
         desktopservices.exe \
         fridgemagnets.exe \
@@ -85,7 +85,7 @@ symbian {
         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/deform_reg.rsc \
         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/pathstroke_reg.rsc \
         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/wiggly_reg.rsc \
-        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/ftp_reg.rsc\
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/qftp_reg.rsc\
         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/saxbookmarks_reg.rsc \
         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/desktopservices_reg.rsc \
         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/fridgemagnets_reg.rsc \
@@ -109,7 +109,7 @@ symbian {
         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/deform.rsc \
         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/pathstroke.rsc \
         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/wiggly.rsc \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/ftp.rsc\
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qftp.rsc\
         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/saxbookmarks.rsc \
         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.rsc \
         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.rsc \
diff --git a/demos/mediaplayer/images/screen.png b/demos/qmediaplayer/images/screen.png
index a15df92e16..a15df92e16 100644
--- a/demos/mediaplayer/images/screen.png
+++ b/demos/qmediaplayer/images/screen.png
diff --git a/demos/mediaplayer/main.cpp b/demos/qmediaplayer/main.cpp
index 66aa445cb7..66aa445cb7 100644
--- a/demos/mediaplayer/main.cpp
+++ b/demos/qmediaplayer/main.cpp
diff --git a/demos/mediaplayer/mediaplayer.cpp b/demos/qmediaplayer/mediaplayer.cpp
index baac23658a..baac23658a 100644
--- a/demos/mediaplayer/mediaplayer.cpp
+++ b/demos/qmediaplayer/mediaplayer.cpp
diff --git a/demos/mediaplayer/mediaplayer.h b/demos/qmediaplayer/mediaplayer.h
index 40ffa403eb..40ffa403eb 100644
--- a/demos/mediaplayer/mediaplayer.h
+++ b/demos/qmediaplayer/mediaplayer.h
diff --git a/demos/mediaplayer/mediaplayer.qrc b/demos/qmediaplayer/mediaplayer.qrc
index bcdf404eb0..bcdf404eb0 100644
--- a/demos/mediaplayer/mediaplayer.qrc
+++ b/demos/qmediaplayer/mediaplayer.qrc
diff --git a/demos/mediaplayer/mediaplayer.pro b/demos/qmediaplayer/qmediaplayer.pro
index a420cc3963..2f15c286be 100644
--- a/demos/mediaplayer/mediaplayer.pro
+++ b/demos/qmediaplayer/qmediaplayer.pro
@@ -3,7 +3,6 @@
 ######################################################################
 
 TEMPLATE = app
-TARGET = qmediaplayer
 DEPENDPATH += . build src ui
 
 QT += phonon
@@ -18,7 +17,7 @@ HEADERS += mediaplayer.h
 
 target.path = $$[QT_INSTALL_DEMOS]/qmediaplayer
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.html *.doc images
-sources.path = $$[QT_INSTALL_DEMOS]/mediaplayer
+sources.path = $$[QT_INSTALL_DEMOS]/qmediaplayer
 INSTALLS += target sources
 
 wince*{
diff --git a/demos/mediaplayer/settings.ui b/demos/qmediaplayer/settings.ui
index d2cedd4296..d2cedd4296 100644
--- a/demos/mediaplayer/settings.ui
+++ b/demos/qmediaplayer/settings.ui
diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml
index 3f0cd25851..2c31484b1a 100644
--- a/demos/qtdemo/xml/examples.xml
+++ b/demos/qtdemo/xml/examples.xml
@@ -121,7 +121,7 @@
     <example filename="network-chat" name="Network Chat Client" />
     <example filename="fortuneclient" name="Fortune Client" />
     <example filename="fortuneserver" name="Fortune Server" />
-    <example filename="ftp" changedirectory="false" name="FTP Client" />
+    <example filename="qftp" changedirectory="false" name="FTP Client" />
     <example filename="http" changedirectory="false" name="HTTP Client" />
     <example filename="loopback" name="Loopback" />
     <example filename="threadedfortuneserver" name="Threaded Fort. Server" />
@@ -152,7 +152,7 @@
     <example filename="transformations" name="Transformations" />
   </category>
   <category dirname="phonon" name="Phonon">
-    <example filename="musicplayer" name="Music Player" />
+    <example filename="qmusicplayer" name="Music Player" />
   </category>
   <category dirname="multimedia/audio" name="Multimedia">
     <example filename="audiodevices" name="Audio Devices" />