From 786dca63ce917cd798f422145c9cba8ab1b8063a Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 25 Jun 2012 00:11:00 +0200 Subject: activeWindow is deprecated, use focusWindow. This complements commit 2753e9a795537df10c5a3b64ec9f6d8d81381837, which had begun fixing this issue, but not completed the entire module. Change-Id: I2d167e467c5553cfa49e04410aec9a7d98c7fc6e Reviewed-by: Lars Knoll --- .../auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 10 +++++----- .../quick/qquicktextinput/tst_qquicktextinput.cpp | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'tests') diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index 763c191263..f893385bd2 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -1154,7 +1154,7 @@ void tst_qquicktextedit::focusOnPress() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QGuiApplication::activeWindow(), &canvas); + QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); QCOMPARE(textEditObject->hasFocus(), false); QCOMPARE(textEditObject->hasActiveFocus(), false); @@ -3942,7 +3942,7 @@ void tst_qquicktextedit::keySequence() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QGuiApplication::activeWindow(), &canvas); + QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); simulateKey(&canvas, layoutDirection); @@ -4104,7 +4104,7 @@ void tst_qquicktextedit::undo() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QGuiApplication::activeWindow(), &canvas); + QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); QVERIFY(!textEdit->canUndo()); @@ -4190,7 +4190,7 @@ void tst_qquicktextedit::redo() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QGuiApplication::activeWindow(), &canvas); + QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); QVERIFY(!textEdit->canUndo()); QVERIFY(!textEdit->canRedo()); @@ -4383,7 +4383,7 @@ void tst_qquicktextedit::undo_keypressevents() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QGuiApplication::activeWindow(), &canvas); + QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); simulateKeys(&canvas, keys); diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp index a87cbeb5dc..73cf2d3aaa 100644 --- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp @@ -2368,7 +2368,7 @@ void tst_qquicktextinput::copyAndPasteKeySequence() { canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QGuiApplication::activeWindow(), &canvas); + QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); // copy and paste QVERIFY(textInput->hasActiveFocus()); @@ -3093,7 +3093,7 @@ void tst_qquicktextinput::focusOnPress() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QGuiApplication::activeWindow(), &canvas); + QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); QCOMPARE(textInputObject->hasFocus(), false); QCOMPARE(textInputObject->hasActiveFocus(), false); @@ -4768,7 +4768,7 @@ void tst_qquicktextinput::keySequence() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QGuiApplication::activeWindow(), &canvas); + QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); simulateKey(&canvas, layoutDirection); @@ -4929,7 +4929,7 @@ void tst_qquicktextinput::undo() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QGuiApplication::activeWindow(), &canvas); + QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); QVERIFY(!textInput->canUndo()); @@ -5015,7 +5015,7 @@ void tst_qquicktextinput::redo() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QGuiApplication::activeWindow(), &canvas); + QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); QVERIFY(!textInput->canUndo()); QVERIFY(!textInput->canRedo()); @@ -5217,7 +5217,7 @@ void tst_qquicktextinput::undo_keypressevents() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QGuiApplication::activeWindow(), &canvas); + QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); simulateKeys(&canvas, keys); @@ -5587,7 +5587,7 @@ void tst_qquicktextinput::setInputMask() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QGuiApplication::activeWindow(), &canvas); + QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); simulateKey(&canvas, Qt::Key_Home); for (int i = 0; i < input.length(); i++) @@ -5717,7 +5717,7 @@ void tst_qquicktextinput::keypress_inputMask() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QGuiApplication::activeWindow(), &canvas); + QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); simulateKeys(&canvas, keys); @@ -5763,7 +5763,7 @@ void tst_qquicktextinput::hasAcceptableInputMask() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QGuiApplication::activeWindow(), &canvas); + QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); // test that invalid input (for required) work for optionalMask textInput->setText(invalid); @@ -5826,7 +5826,7 @@ void tst_qquicktextinput::maskCharacter() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QGuiApplication::activeWindow(), &canvas); + QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); for (int i = 0; i < input.size(); ++i) { QString in = QString(input.at(i)); -- cgit v1.2.3