diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2012-04-04 12:19:06 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-04 13:29:13 +0200 |
commit | 03a6db7fc17355d4478da05891860df6c0eb1560 (patch) | |
tree | bc616f10ae862d24bd73274aad96b950ca64179c /tests | |
parent | 62e88faeb4ec8b3ad6209cadd2d3e5dcc3b4217e (diff) |
Revert "Do not execute overwritten bindings"
This reverts commit 639208cc7f3ab3d8356363559e8fcf168e32cf0b.
There were two problems with this submit:
1. Maintaining a hash of all the properties we have assigned bindings
to is massively inefficient.
2. The autotest was in the qquickbinding testcase which is for the
QtQuick "Binding" element, not for generic binding tests.
Change-Id: Id2150dbfe86c6844cc0b115d7f941ae8d6a60643
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qml/qquickbinding/data/InnerObject.qml | 13 | ||||
-rw-r--r-- | tests/auto/qml/qquickbinding/data/OuterObject.qml | 5 | ||||
-rw-r--r-- | tests/auto/qml/qquickbinding/data/replaceBinding.qml | 26 | ||||
-rw-r--r-- | tests/auto/qml/qquickbinding/tst_qquickbinding.cpp | 12 |
4 files changed, 0 insertions, 56 deletions
diff --git a/tests/auto/qml/qquickbinding/data/InnerObject.qml b/tests/auto/qml/qquickbinding/data/InnerObject.qml deleted file mode 100644 index a8ed9593d1..0000000000 --- a/tests/auto/qml/qquickbinding/data/InnerObject.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property int foo1: 100 - property int foo2: 100 - property int foo3: { return 100; } - property int foo4: { return 100; } - - property string bar1: 'Hello' - property string bar2: 'Hello' - property string bar3: { return 'Hello'; } - property string bar4: { return 'Hello'; } -} diff --git a/tests/auto/qml/qquickbinding/data/OuterObject.qml b/tests/auto/qml/qquickbinding/data/OuterObject.qml deleted file mode 100644 index da571a9732..0000000000 --- a/tests/auto/qml/qquickbinding/data/OuterObject.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -Item { - property InnerObject inner: InnerObject {} -} diff --git a/tests/auto/qml/qquickbinding/data/replaceBinding.qml b/tests/auto/qml/qquickbinding/data/replaceBinding.qml deleted file mode 100644 index 670231a144..0000000000 --- a/tests/auto/qml/qquickbinding/data/replaceBinding.qml +++ /dev/null @@ -1,26 +0,0 @@ -import QtQuick 2.0 - -OuterObject { - property bool success: false - - inner.foo1: 200 - inner.foo2: { return 200; } - inner.foo3: 200 - inner.foo4: { return 200; } - - inner.bar1: 'Goodbye' - inner.bar2: { return 'Goodbye' } - inner.bar3: 'Goodbye' - inner.bar4: { return 'Goodbye' } - - Component.onCompleted: { - success = (inner.foo1 == 200 && - inner.foo2 == 200 && - inner.foo3 == 200 && - inner.foo4 == 200 && - inner.bar1 == 'Goodbye' && - inner.bar2 == 'Goodbye' && - inner.bar3 == 'Goodbye' && - inner.bar4 == 'Goodbye'); - } -} diff --git a/tests/auto/qml/qquickbinding/tst_qquickbinding.cpp b/tests/auto/qml/qquickbinding/tst_qquickbinding.cpp index 0aef837e3b..939c4a9e3d 100644 --- a/tests/auto/qml/qquickbinding/tst_qquickbinding.cpp +++ b/tests/auto/qml/qquickbinding/tst_qquickbinding.cpp @@ -57,7 +57,6 @@ private slots: void restoreBinding(); void restoreBindingWithLoop(); void deletedObject(); - void replaceBinding(); private: QQmlEngine engine; @@ -193,17 +192,6 @@ void tst_qquickbinding::deletedObject() delete rect; } -void tst_qquickbinding::replaceBinding() -{ - QQmlEngine engine; - QQmlComponent c(&engine, testFileUrl("replaceBinding.qml")); - QObject *obj = c.create(); - QVERIFY(obj != 0); - - QVERIFY(obj->property("success").toBool()); - delete obj; -} - QTEST_MAIN(tst_qquickbinding) #include "tst_qquickbinding.moc" |