summaryrefslogtreecommitdiffstats
path: root/demos/embedded
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/embedded
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/embedded')
-rw-r--r--demos/embedded/fluidlauncher/config_s60/config.xml2
-rw-r--r--demos/embedded/fluidlauncher/fluidlauncher.pro6
2 files changed, 4 insertions, 4 deletions
diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/demos/embedded/fluidlauncher/config_s60/config.xml
index fefa3dd..2c61baf 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 f2abde6..dd931e6 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 \