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

15 files changed, 8 insertions, 8 deletions

diff --git a/examples/network/network.pro b/examples/network/network.pro
index 38cdae8..0849271 100644
--- a/examples/network/network.pro
+++ b/examples/network/network.pro
@@ -6,7 +6,7 @@ SUBDIRS       = blockingfortuneclient \
                 downloadmanager \
                 fortuneclient \
                 fortuneserver \
-                ftp \
+                qftp \
                 http \
                 loopback \
                 threadedfortuneserver \
@@ -16,7 +16,7 @@ SUBDIRS       = blockingfortuneclient \
 # no QProcess
 !vxworks:!qnx:SUBDIRS += network-chat
 
-symbian: SUBDIRS = ftp
+symbian: SUBDIRS = qftp
 
 contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient
 
diff --git a/examples/network/ftp/ftp.qrc b/examples/network/qftp/ftp.qrc
index b598ab8..b598ab8 100644
--- a/examples/network/ftp/ftp.qrc
+++ b/examples/network/qftp/ftp.qrc
diff --git a/examples/network/ftp/ftpwindow.cpp b/examples/network/qftp/ftpwindow.cpp
index f3fc52b..f3fc52b 100644
--- a/examples/network/ftp/ftpwindow.cpp
+++ b/examples/network/qftp/ftpwindow.cpp
diff --git a/examples/network/ftp/ftpwindow.h b/examples/network/qftp/ftpwindow.h
index f92c36a..f92c36a 100644
--- a/examples/network/ftp/ftpwindow.h
+++ b/examples/network/qftp/ftpwindow.h
diff --git a/examples/network/ftp/images/cdtoparent.png b/examples/network/qftp/images/cdtoparent.png
index 24b6180..24b6180 100644
--- a/examples/network/ftp/images/cdtoparent.png
+++ b/examples/network/qftp/images/cdtoparent.png
diff --git a/examples/network/ftp/images/dir.png b/examples/network/qftp/images/dir.png
index 0ce5ae7..0ce5ae7 100644
--- a/examples/network/ftp/images/dir.png
+++ b/examples/network/qftp/images/dir.png
diff --git a/examples/network/ftp/images/file.png b/examples/network/qftp/images/file.png
index be6c530..be6c530 100644
--- a/examples/network/ftp/images/file.png
+++ b/examples/network/qftp/images/file.png
diff --git a/examples/network/ftp/main.cpp b/examples/network/qftp/main.cpp
index d44ccd7..d44ccd7 100644
--- a/examples/network/ftp/main.cpp
+++ b/examples/network/qftp/main.cpp
diff --git a/examples/network/ftp/ftp.pro b/examples/network/qftp/qftp.pro
index ce2a97b..b3106c3 100644
--- a/examples/network/ftp/ftp.pro
+++ b/examples/network/qftp/qftp.pro
@@ -5,9 +5,9 @@ RESOURCES    += ftp.qrc
 QT           += network
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/network/ftp
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS ftp.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/network/ftp
+target.path = $$[QT_INSTALL_EXAMPLES]/network/qftp
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/qftp
 INSTALLS += target sources
 
 symbian {
diff --git a/examples/network/ftp/sym_iap_util.h b/examples/network/qftp/sym_iap_util.h
index ebeae0a..ebeae0a 100644
--- a/examples/network/ftp/sym_iap_util.h
+++ b/examples/network/qftp/sym_iap_util.h
diff --git a/examples/phonon/phonon.pro b/examples/phonon/phonon.pro
index 0ddf767..aa6ac13 100644
--- a/examples/phonon/phonon.pro
+++ b/examples/phonon/phonon.pro
@@ -1,6 +1,6 @@
 TEMPLATE      = subdirs
 CONFIG       += ordered
-SUBDIRS       = musicplayer \
+SUBDIRS       = qmusicplayer \
                 capabilities
 
 # install
diff --git a/examples/phonon/musicplayer/main.cpp b/examples/phonon/qmusicplayer/main.cpp
index fc7baa3..fc7baa3 100644
--- a/examples/phonon/musicplayer/main.cpp
+++ b/examples/phonon/qmusicplayer/main.cpp
diff --git a/examples/phonon/musicplayer/mainwindow.cpp b/examples/phonon/qmusicplayer/mainwindow.cpp
index 787ae53..787ae53 100644
--- a/examples/phonon/musicplayer/mainwindow.cpp
+++ b/examples/phonon/qmusicplayer/mainwindow.cpp
diff --git a/examples/phonon/musicplayer/mainwindow.h b/examples/phonon/qmusicplayer/mainwindow.h
index 41f8147..41f8147 100644
--- a/examples/phonon/musicplayer/mainwindow.h
+++ b/examples/phonon/qmusicplayer/mainwindow.h
diff --git a/examples/phonon/musicplayer/musicplayer.pro b/examples/phonon/qmusicplayer/qmusicplayer.pro
index a0c953a..25ab7eb 100644
--- a/examples/phonon/musicplayer/musicplayer.pro
+++ b/examples/phonon/qmusicplayer/qmusicplayer.pro
@@ -5,9 +5,9 @@ SOURCES   += main.cpp \
              mainwindow.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/phonon/musicplayer
+target.path = $$[QT_INSTALL_EXAMPLES]/phonon/qmusicplayer
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png images
-sources.path = $$[QT_INSTALL_EXAMPLES]/phonon/musicplayer
+sources.path = $$[QT_INSTALL_EXAMPLES]/phonon/qmusicplayer
 INSTALLS += target sources
 
 wince*{