summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2010-12-14 05:27:23 (GMT)
committerJoona Petrell <joona.t.petrell@nokia.com>2010-12-14 05:37:50 (GMT)
commitf58cf707dd5668ca2849f457e951a9cef7d1d544 (patch)
tree118ea95d7650043813850004c318989a74a1a7f5 /tests/auto
parent040268af2d53532e7f6501c24cdfcb424d60be89 (diff)
downloadQt-f58cf707dd5668ca2849f457e951a9cef7d1d544.zip
Qt-f58cf707dd5668ca2849f457e951a9cef7d1d544.tar.gz
Qt-f58cf707dd5668ca2849f457e951a9cef7d1d544.tar.bz2
Revert a fix made for bug QTBUG-15341
Reverted a commit 2eee49127b80b5b56c605f76ccea004b03d89577 "Remove active selection when TextEdit loses focus". Contrary to TextInput, by default TextEdit keeps the selection visible when the editor loses active focus. If this is not wanted, a property called persistentSelection can be set false to make selection dependant on the focus.
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp40
1 files changed, 0 insertions, 40 deletions
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index ed02451..a7971cc 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -110,7 +110,6 @@ private slots:
void mouseSelection_data();
void mouseSelection();
void inputMethodHints();
- void clearSelectionOnFocusLost();
void cursorDelegate();
void delegateLoading_data();
@@ -749,45 +748,6 @@ void tst_qdeclarativetextedit::inputMethodHints()
QVERIFY(textEditObject->inputMethodHints() & Qt::ImhUppercaseOnly);
}
-// QTBUG-15341
-void tst_qdeclarativetextedit::clearSelectionOnFocusLost()
-{
-
- // create a visible scene with two text edits
- QGraphicsScene scene;
- QGraphicsView view(&scene);
- QDeclarativeTextEdit edit;
- QDeclarativeTextEdit secondEdit;
- edit.setText("Hello world!");
- scene.addItem(&edit);
- scene.addItem(&secondEdit);
- view.show();
- QApplication::setActiveWindow(&view);
- QTest::qWaitForWindowShown(&view);
- QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
-
- int index = 0;
- while (index < Qt::NoFocusReason) {
-
- // focus the first text edit and select text
- edit.setFocus(true);
- edit.selectAll();
- QVERIFY(edit.hasActiveFocus() && !secondEdit.hasActiveFocus());
- QCOMPARE(edit.selectedText().size(), 12);
-
- // lose focus in the first text edit
- qobject_cast<QGraphicsObject*>(&secondEdit)->setFocus(Qt::FocusReason(index));
- QVERIFY(!edit.hasActiveFocus() && secondEdit.hasActiveFocus());
-
- // depending on the focus reason, selection should now be cleared
- bool clearSelection = (index != Qt::ActiveWindowFocusReason && index != Qt::PopupFocusReason);
- QCOMPARE(edit.selectedText().isEmpty(), clearSelection);
- index++;
- }
-}
-
-
-
void tst_qdeclarativetextedit::cursorDelegate()
{
QDeclarativeView* view = createView(SRCDIR "/data/cursorTest.qml");