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

Change-Id: I11ea57222ba5aa683b7bfd7735fbc1d2cf86e875

1 files changed, 2 insertions, 5 deletions

diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index 85123c6f92..493c03d00e 100644
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
@@ -71,7 +71,7 @@ QString createExpectedFileIfNotFound(const QString& filebasename, const QImage&
     QString persistent_dir = QQmlDataTest::instance()->dataDirectory();
     QString arch = "unknown-architecture"; // QTest needs to help with this.
 
-    QString expectfile = persistent_dir + QDir::separator() + filebasename + "-" + arch + ".png";
+    QString expectfile = persistent_dir + QDir::separator() + filebasename + QLatin1Char('-') + arch + ".png";
 
     if (!QFile::exists(expectfile)) {
         actual.save(expectfile);
@@ -2857,10 +2857,7 @@ void tst_qquicktextinput::cursorDelegate()
 
 void tst_qquicktextinput::remoteCursorDelegate()
 {
-    TestHTTPServer server;
-    QVERIFY2(server.listen(), qPrintable(server.errorString()));
-    server.serveDirectory(dataDirectory(), TestHTTPServer::Delay);
-
+    ThreadedTestHTTPServer server(dataDirectory(), TestHTTPServer::Delay);
     QQuickView view;
 
     QQmlComponent component(view.engine(), server.url("/RemoteCursor.qml"));