Merge remote-tracking branch 'origin/5.6' into dev

Conflicts:
	tests/auto/corelib/io/qfile/tst_qfile.cpp
	tests/auto/corelib/io/qprocess/tst_qprocess.cpp
	tests/auto/corelib/tools/qversionnumber/qversionnumber.pro

Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e

1 files changed, 5 insertions, 6 deletions

diff --git a/examples/widgets/gestures/imagegestures/imagewidget.cpp b/examples/widgets/gestures/imagegestures/imagewidget.cpp
index 440eb783c1..28c715c688 100644
--- a/examples/widgets/gestures/imagegestures/imagewidget.cpp
+++ b/examples/widgets/gestures/imagegestures/imagewidget.cpp
@@ -200,7 +200,6 @@ void ImageWidget::openDirectory(const QString &path)
 
 QImage ImageWidget::loadImage(const QString &fileName)
 {
-    qDebug() << position << files << fileName;
     QImageReader reader(fileName);
     reader.setAutoTransform(true);
     qCDebug(lcExample) << "loading" << QDir::toNativeSeparators(fileName) << position << '/' << files.size();
@@ -230,7 +229,7 @@ void ImageWidget::goNextImage()
         prevImage = currentImage;
         currentImage = nextImage;
         if (position+1 < files.size())
-            nextImage = loadImage(path+QLatin1String("/")+files.at(position+1));
+            nextImage = loadImage(path + QLatin1Char('/') + files.at(position+1));
         else
             nextImage = QImage();
     }
@@ -247,7 +246,7 @@ void ImageWidget::goPrevImage()
         nextImage = currentImage;
         currentImage = prevImage;
         if (position > 0)
-            prevImage = loadImage(path+QLatin1String("/")+files.at(position-1));
+            prevImage = loadImage(path + QLatin1Char('/') + files.at(position-1));
         else
             prevImage = QImage();
     }
@@ -277,12 +276,12 @@ void ImageWidget::goToImage(int index)
     position = index;
 
     if (index > 0)
-        prevImage = loadImage(path+QLatin1String("/")+files.at(position-1));
+        prevImage = loadImage(path + QLatin1Char('/') + files.at(position-1));
     else
         prevImage = QImage();
-    currentImage = loadImage(path+QLatin1String("/")+files.at(position));
+    currentImage = loadImage(path + QLatin1Char('/') + files.at(position));
     if (position+1 < files.size())
-        nextImage = loadImage(path+QLatin1String("/")+files.at(position+1));
+        nextImage = loadImage(path + QLatin1Char('/') + files.at(position+1));
     else
         nextImage = QImage();
     update();