summaryrefslogtreecommitdiffstats
path: root/demos/qtdemo
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-10-09 09:29:51 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-10-09 12:09:08 (GMT)
commitfaef2f5101287ad8ce94cf8e7a4d574a7d6267fd (patch)
tree90d6c2b4e295a1502ccfbd5ab48cedc673ed7436 /demos/qtdemo
parent4f2d382059b06f89d58816c03137d75931654b94 (diff)
downloadQt-faef2f5101287ad8ce94cf8e7a4d574a7d6267fd.zip
Qt-faef2f5101287ad8ce94cf8e7a4d574a7d6267fd.tar.gz
Qt-faef2f5101287ad8ce94cf8e7a4d574a7d6267fd.tar.bz2
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
Diffstat (limited to 'demos/qtdemo')
-rw-r--r--demos/qtdemo/xml/examples.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml
index 3f0cd25..2c31484 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" />