diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-29 14:11:38 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-29 21:20:32 +0100 |
commit | 61e519e230217aa32869ed70fc38ee947fb9b313 (patch) | |
tree | e39ee106dbeb8b493d1d836d394e4ed7d6d709b1 /tests | |
parent | abbb5c2bd9e1701c07d59d47e3f401a84537cc75 (diff) |
Eliminate noop translation bindings
We can store them as regular strings. This has the advantage that the
entire special handling from the custom parser of the list model goes away,
we don't need astForBinding in QQmlCustomParser anymore neither and types
with a custom parser can now generally benefit from the expression simplification
pass.
Change-Id: I39d1b76edd1273d8c73b847aed71f7bcce37d877
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp index 787aa0f7da..678849c371 100644 --- a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp +++ b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp @@ -296,17 +296,17 @@ void tst_qqmllistmodel::static_i18n_data() QTest::newRow("QT_TR_NOOP extra param") << QString::fromUtf8("ListElement { foo: QT_TR_NOOP(\"hello\",\"world\") }") << QVariant(QString()) - << QString("ListElement: improperly specified QT_TR_NOOP"); + << QString("ListElement: cannot use script for property value"); QTest::newRow("QT_TRANSLATE_NOOP missing params") << "ListElement { foo: QT_TRANSLATE_NOOP() }" << QVariant(QString()) - << QString("ListElement: improperly specified QT_TRANSLATE_NOOP"); + << QString("ListElement: cannot use script for property value"); QTest::newRow("QT_TRID_NOOP missing param") << QString::fromUtf8("ListElement { foo: QT_TRID_NOOP() }") << QVariant(QString()) - << QString("ListElement: improperly specified QT_TRID_NOOP"); + << QString("ListElement: cannot use script for property value"); } void tst_qqmllistmodel::static_i18n() |