diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/network/network.pro | 4 | ||||
-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) | bin | 139 -> 139 bytes | |||
-rw-r--r-- | examples/network/qftp/images/dir.png (renamed from examples/network/ftp/images/dir.png) | bin | 154 -> 154 bytes | |||
-rw-r--r-- | examples/network/qftp/images/file.png (renamed from examples/network/ftp/images/file.png) | bin | 129 -> 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 | ||||
-rw-r--r-- | examples/phonon/phonon.pro | 2 | ||||
-rw-r--r-- | examples/phonon/qmusicplayer/main.cpp (renamed from examples/phonon/musicplayer/main.cpp) | 0 | ||||
-rw-r--r-- | examples/phonon/qmusicplayer/mainwindow.cpp (renamed from examples/phonon/musicplayer/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/phonon/qmusicplayer/mainwindow.h (renamed from examples/phonon/musicplayer/mainwindow.h) | 0 | ||||
-rw-r--r-- | examples/phonon/qmusicplayer/qmusicplayer.pro (renamed from examples/phonon/musicplayer/musicplayer.pro) | 4 |
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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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*{ |