aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-05-05 15:52:53 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-05-05 15:52:54 +0200
commit9f6a3bf96fabeca58599029f9d9d59b7ed852569 (patch)
treed8a47b67c3b5817d1f5f77c312adbe655b1ca576 /tests
parente807f9d1d80559b8ff91f1c3cfdd755b3da56a6d (diff)
parenta2eef6b511988b2435c4e39b6b5551e857ce7775 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp15
1 files changed, 14 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
index 061d5f8a1a..0e6c3b3ad9 100644
--- a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
+++ b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
@@ -169,9 +169,22 @@ void tst_QQuickAccessible::quickAttachedProperties()
delete object;
}
- // Attached property
+ // Attaching to non-item
{
QObject parent;
+ QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML QtObject: Accessible must be attached to an Item");
+ QQuickAccessibleAttached *attachedObj = new QQuickAccessibleAttached(&parent);
+
+ QCOMPARE(attachedObj->ignored(), false);
+ attachedObj->setIgnored(true);
+ QCOMPARE(attachedObj->ignored(), false);
+ attachedObj->setIgnored(false);
+ QCOMPARE(attachedObj->ignored(), false);
+ }
+
+ // Attached property
+ {
+ QQuickItem parent;
QQuickAccessibleAttached *attachedObj = new QQuickAccessibleAttached(&parent);
attachedObj->name();