summaryrefslogtreecommitdiffstats
path: root/examples/network
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-10-09 11:29:51 +0200
committerFrans Englich <frans.englich@nokia.com>2009-10-09 14:09:08 +0200
commitfaef2f5101287ad8ce94cf8e7a4d574a7d6267fd (patch)
tree90d6c2b4e295a1502ccfbd5ab48cedc673ed7436 /examples/network
parent4f2d382059b06f89d58816c03137d75931654b94 (diff)
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 'examples/network')
-rw-r--r--examples/network/network.pro4
-rw-r--r--examples/network/qftp/ftp.qrc (renamed from examples/network/ftp/ftp.qrc)0
-rw-r--r--examples/network/qftp/ftpwindow.cpp (renamed from examples/network/ftp/ftpwindow.cpp)0
-rw-r--r--examples/network/qftp/ftpwindow.h (renamed from examples/network/ftp/ftpwindow.h)0
-rw-r--r--examples/network/qftp/images/cdtoparent.png (renamed from examples/network/ftp/images/cdtoparent.png)bin139 -> 139 bytes
-rw-r--r--examples/network/qftp/images/dir.png (renamed from examples/network/ftp/images/dir.png)bin154 -> 154 bytes
-rw-r--r--examples/network/qftp/images/file.png (renamed from examples/network/ftp/images/file.png)bin129 -> 129 bytes
-rw-r--r--examples/network/qftp/main.cpp (renamed from examples/network/ftp/main.cpp)0
-rw-r--r--examples/network/qftp/qftp.pro (renamed from examples/network/ftp/ftp.pro)6
-rw-r--r--examples/network/qftp/sym_iap_util.h (renamed from examples/network/ftp/sym_iap_util.h)0
10 files changed, 5 insertions, 5 deletions
diff --git a/examples/network/network.pro b/examples/network/network.pro
index 38cdae8699..08492711cb 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 b598ab8829..b598ab8829 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 f3fc52b26c..f3fc52b26c 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 f92c36afeb..f92c36afeb 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 24b6180829..24b6180829 100644
--- a/examples/network/ftp/images/cdtoparent.png
+++ b/examples/network/qftp/images/cdtoparent.png
Binary files differ
diff --git a/examples/network/ftp/images/dir.png b/examples/network/qftp/images/dir.png
index 0ce5ae75fc..0ce5ae75fc 100644
--- a/examples/network/ftp/images/dir.png
+++ b/examples/network/qftp/images/dir.png
Binary files differ
diff --git a/examples/network/ftp/images/file.png b/examples/network/qftp/images/file.png
index be6c53089a..be6c53089a 100644
--- a/examples/network/ftp/images/file.png
+++ b/examples/network/qftp/images/file.png
Binary files differ
diff --git a/examples/network/ftp/main.cpp b/examples/network/qftp/main.cpp
index d44ccd77ee..d44ccd77ee 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 ce2a97b5a9..b3106c3a94 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 ebeae0aa81..ebeae0aa81 100644
--- a/examples/network/ftp/sym_iap_util.h
+++ b/examples/network/qftp/sym_iap_util.h