summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-06-02 14:03:56 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-03 15:48:26 +0200
commitf34e5fdec8ed80344633ce2b1b140a3d156f616c (patch)
tree5748a82b0c5c908f526ff24ec5d742c0947e1b1c
parent5652acc4ee18416f3b4e11d73bd1c0d5f65add87 (diff)
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 <jpnurmi@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r--tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp2
1 files changed, 1 insertions, 1 deletions
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