summaryrefslogtreecommitdiffstats
path: root/examples/network/qftp
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2010-02-01 08:08:22 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2010-02-01 08:08:22 (GMT)
commit4a83af372b965b6dbe25f6a08e14aee09bb9355e (patch)
treeb0d7fc6eee76b65ee7e836b871f7b28e1ad2bc5c /examples/network/qftp
parent465a63d00c2294641539af820435a9a4315f0251 (diff)
parent37f1aec1a4e71a7102e8cd2e2908c8d3be7e29f5 (diff)
downloadQt-4a83af372b965b6dbe25f6a08e14aee09bb9355e.zip
Qt-4a83af372b965b6dbe25f6a08e14aee09bb9355e.tar.gz
Qt-4a83af372b965b6dbe25f6a08e14aee09bb9355e.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'examples/network/qftp')
-rw-r--r--examples/network/qftp/ftpwindow.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/network/qftp/ftpwindow.cpp b/examples/network/qftp/ftpwindow.cpp
index ae3a2b6..3fd62f8 100644
--- a/examples/network/qftp/ftpwindow.cpp
+++ b/examples/network/qftp/ftpwindow.cpp
@@ -324,7 +324,8 @@ void FtpWindow::processItem(QTreeWidgetItem *item, int /*column*/)
if (isDirectory.value(name)) {
fileList->clear();
isDirectory.clear();
- currentPath += "/" + name;
+ currentPath += '/';
+ currentPath += name;
ftp->cd(name);
ftp->list();
cdToParentButton->setEnabled(true);