summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGlenn Watson <glenn.watson@nokia.com>2012-07-12 14:21:04 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-13 02:30:52 +0200
commitdb51bfb8553cec39caf5a17e82ff8e471718493f (patch)
treef3b53cafe6295c9a5118d5d67278649a70f34152 /tests
parent26dffa25391cb900c61f79d8bd327a5827973a79 (diff)
Fix objectName test in tst_qdeclarativeecmascript.
The QtQuick1 library relied on special case handling of the objectName property in qtbase. With Qt5, there is a normal notify signal for objectNameChanged. Remove the QtQuick1 special cases and fall through to the default code path. Task-number: QTBUG-26334 Change-Id: I70f31947b6c74c7125d6f99a33e9b02d7ef52273 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index f07f7010..d561fbb3 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -2845,7 +2845,6 @@ void tst_qdeclarativeecmascript::objectName()
o->setObjectName("world");
- QEXPECT_FAIL("", "QTBUG-26334 - set object name fails", Abort);
QCOMPARE(o->property("test1").toString(), QString("world"));
QCOMPARE(o->property("test2").toString(), QString("orl"));