Merge remote-tracking branch 'origin/5.5' into 5.6.0

Conflicts:
	.qmake.conf

Change-Id: Id54f50aa7e6e6ad3c69254a37cff17354092348b

2 files changed, 4 insertions, 1 deletions

diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 9459ca20..031df00e 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -1919,6 +1919,9 @@ void tst_qdeclarativetextedit::delegateLoading()
     QFETCH(QString, qmlfile);
     QFETCH(QString, error);
 
+    if (qstrcmp(QTest::currentDataTag(), "fail1") == 0)
+        QSKIP("QTBUG-48299", SkipSingle);
+
     TestHTTPServer server(42332);
     server.serveDirectory(testFile("httpfail"), TestHTTPServer::Disconnect);
     server.serveDirectory(testFile("httpslow"), TestHTTPServer::Delay);
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index 972f9a42..1a7e4fec 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -1613,7 +1613,7 @@ void tst_qdeclarativetextinput::navigation()
     simulateKey(canvas, Qt::Key_Left);
     QVERIFY(input->hasActiveFocus() == true);
 
-    // Up and Down should NOT do Home/End, even on Mac OS X (QTBUG-10438).
+    // Up and Down should NOT do Home/End, even on OS X (QTBUG-10438).
     input->setCursorPosition(2);
     QCOMPARE(input->cursorPosition(),2);
     simulateKey(canvas, Qt::Key_Up);