From a670a0a8ae4e649de90c5e5c39276d683c11f7e0 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Wed, 15 Jul 2015 15:51:09 +0200 Subject: Doc: Replace Mac OS X with OS X Task-number: QTBUG-40759 Change-Id: I1c05a2d07f38da1129bc127fd17c15f843b16bda Reviewed-by: Venugopal Shivashankar --- .../declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') 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); -- cgit v1.2.1 From f079636a3ee5538eb79fd4e7e6ffcb0465a015a0 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 17 Sep 2015 08:40:43 +0200 Subject: Skip failing autotest tst_qdeclarativetextedit::delegateLoading The test failures point to a race condition in QtNetwork when a socket is prematurely closed by the server. Anyhow, the race condition has been there before, just that a recent change in Qt5Core made it more likely to be hit. Disabling the test for now: This is better handled in qtbase, and shouldn't block the release. Task-number: QTBUG-48299 Change-Id: If6877d47940d422e94b6d20d24a8fbdb89692f71 Reviewed-by: Friedemann Kleint --- .../auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests') 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); -- cgit v1.2.1