Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fixed `make test' for xmlpatternsxqts.
  Doc: Put the correct images with the D-Bus and Embedded Linux sections.
  Call cheaper clear() instead of assigning new QString()
  Fix some foreach usage to use const refs
  googlesuggest example: Add newline to end of file
  Core classes, examples, demos: Some changes from string to char
  Fix header labels on mac with rtl

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);