diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-05-21 10:45:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-21 11:13:31 +0200 |
| commit | a7122f3b2832ad65cfd0ab0ce0315a7042ee9f92 (patch) | |
| tree | 3656ae366d31a26915746b277b5dd2cb101ba19c /tests/auto/quick/qquicktextinput | |
| parent | 815838373a0b645f099c84e201b3dd8c7db6f953 (diff) | |
Fix tst_qquicktextinput::copyAndPaste() for asynchronous clipboard notification.
Change qtbase 6a61a00ddb21e79412e82069dfef50192bfd724d for Windows uses
new clipboard notification API that results in asynchronous clipboard
notifications.
Task-number: QTBUG-39145
Task-number: QTBUG-38670
Task-number: QTBUG-33492
Change-Id: I0de78ecba5c67bf6a66f07e59312667f6ce6bf88
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'tests/auto/quick/qquicktextinput')
| -rw-r--r-- | tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp index 684229aa07..8451b527ce 100644 --- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp @@ -2490,7 +2490,7 @@ void tst_qquicktextinput::copyAndPaste() QCOMPARE(textInput->selectedText(), QString("Hello world!")); QCOMPARE(textInput->selectedText().length(), 12); textInput->setCursorPosition(0); - QVERIFY(textInput->canPaste()); + QTRY_VERIFY(textInput->canPaste()); textInput->paste(); QCOMPARE(textInput->text(), QString("Hello world!Hello world!")); QCOMPARE(textInput->text().length(), 24); @@ -2544,7 +2544,7 @@ void tst_qquicktextinput::copyAndPaste() QClipboard *clipboard = QGuiApplication::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 @@ -2612,7 +2612,7 @@ void tst_qquicktextinput::copyAndPasteKeySequence() QClipboard *clipboard = QGuiApplication::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 |