From f34e5fdec8ed80344633ce2b1b140a3d156f616c Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 2 Jun 2014 14:03:56 +0200 Subject: Fix tst_qdeclarativetextinput::copyAndPaste() for asynchronous clipboard notification. Change qtbase 6a61a00ddb21e79412e82069dfef50192bfd724d for Windows uses new clipboard notification API that results in asynchronous clipboard notifications. This change is similar to qtdeclarative/a7122f3b2832ad65cfd0ab0ce0315a7042ee9f92 Change-Id: I3bb85f7dbc258f8f93cde8af1c9b24286b99ce21 Reviewed-by: J-P Nurmi Reviewed-by: Friedemann Kleint --- .../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 3ae795cc..066c0cfa 100644 --- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp +++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp @@ -1735,7 +1735,7 @@ void tst_qdeclarativetextinput::copyAndPaste() { QClipboard *clipboard = QApplication::clipboard(); QVERIFY(clipboard); clipboard->clear(); - QVERIFY(!textInput->canPaste()); + QTRY_VERIFY(!textInput->canPaste()); // test that copy functionality is disabled // when echo mode is set to hide text/password mode -- cgit v1.2.3