summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-10-19 23:35:26 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-10-19 23:37:13 (GMT)
commitddc7f627d85436d76f5ca881bd6f16efb8962af5 (patch)
tree3b7944c49d296ab48ad543843932fe5cbb905c61 /tests/auto
parent197354a4d7668fda7c4dce4704f0143528959938 (diff)
downloadQt-ddc7f627d85436d76f5ca881bd6f16efb8962af5.zip
Qt-ddc7f627d85436d76f5ca881bd6f16efb8962af5.tar.gz
Qt-ddc7f627d85436d76f5ca881bd6f16efb8962af5.tar.bz2
Further focus scope fixes.
Follow-up to e11ee40cefc981fbdcfb10816039d4efb080fb17. Reviewed-by: Yoann Lopes
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp6
-rw-r--r--tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp1
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp
index 4cafbd9..1645dac 100644
--- a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp
+++ b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp
@@ -398,6 +398,12 @@ void tst_qdeclarativefocusscope::signalEmission()
QCOMPARE(item3->property("color"), blue);
QCOMPARE(item4->property("color"), red);
+ item4->setFocus(false);
+ QCOMPARE(item1->property("color"), blue);
+ QCOMPARE(item2->property("color"), red);
+ QCOMPARE(item3->property("color"), blue);
+ QCOMPARE(item4->property("color"), blue);
+
delete view;
}
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 30199bb..a3bd0b0 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -9068,6 +9068,7 @@ void tst_QGraphicsItem::focusScope()
QVERIFY(!scope2->hasFocus());
QVERIFY(scope1->hasFocus());
scope2->setFocus();
+ QVERIFY(scope2->hasFocus());
scope3->setFocus();
QVERIFY(scope3->hasFocus());