aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp')
-rw-r--r--tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
index e3fa762b25..01aa9a5937 100644
--- a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
+++ b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
@@ -493,13 +493,14 @@ void tst_QQmlDelegateModel::overriddenModelData()
QObject *delegate = delegateModel->object(0);
QVERIFY(delegate);
- if (i == 2) {
+ if (i == 1 || i == 2) {
+ // You can actually not override if the model is a QObject or a JavaScript array.
// Someone is certainly relying on this.
// We need to find a migration mechanism to fix it.
- QEXPECT_FAIL("", "You can actually not override if the model is a QObject", Continue);
+ QCOMPARE(delegate->objectName(), QLatin1String(" 0 0 e 0"));
+ } else {
+ QCOMPARE(delegate->objectName(), QLatin1String("a b c d e f"));
}
-
- QCOMPARE(delegate->objectName(), QLatin1String("a b c d e f"));
}
}