diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-06-03 06:27:47 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-06-03 06:53:11 (GMT) |
| commit | 939375996496a55a1bb424d6a328f47d2224ed51 (patch) | |
| tree | e196085fb599e38fe6a19491500c33f8b9119a8c /tests/auto/declarative | |
| parent | 26d65a844b20a0056820c15188532b3895a3e091 (diff) | |
| download | Qt-939375996496a55a1bb424d6a328f47d2224ed51.zip Qt-939375996496a55a1bb424d6a328f47d2224ed51.tar.gz Qt-939375996496a55a1bb424d6a328f47d2224ed51.tar.bz2 | |
Improve input panel handling in declarative demos and examples
Task-number: QTBUG-11157
Reviewed-by: Warwick Allison
Diffstat (limited to 'tests/auto/declarative')
| -rw-r--r-- | tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index fbab30e..474eb3f 100644 --- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -956,12 +956,6 @@ void tst_qdeclarativetextedit::openInputPanelOnFocus() edit.setFocusOnPress(true); QCOMPARE(focusOnPressSpy.count(),2); - // active window focus reason should not cause input panel to open - QGraphicsObject * editObject = qobject_cast<QGraphicsObject*>(&edit); - editObject->setFocus(Qt::ActiveWindowFocusReason); - QCOMPARE(ic.openInputPanelReceived, false); - QCOMPARE(ic.closeInputPanelReceived, false); - // and input panel should not open if focus has already been set edit.setFocus(true); QCOMPARE(ic.openInputPanelReceived, false); diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp index 3cb4da0..c1c6634 100644 --- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp +++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp @@ -902,12 +902,6 @@ void tst_qdeclarativetextinput::openInputPanelOnFocus() input.setFocusOnPress(true); QCOMPARE(focusOnPressSpy.count(),2); - // active window focus reason should not cause input panel to open - QGraphicsObject * inputObject = qobject_cast<QGraphicsObject*>(&input); - inputObject->setFocus(Qt::ActiveWindowFocusReason); - QCOMPARE(ic.openInputPanelReceived, false); - QCOMPARE(ic.closeInputPanelReceived, false); - // and input panel should not open if focus has already been set input.setFocus(true); QCOMPARE(ic.openInputPanelReceived, false); |