aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeecmascript
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2011-10-14 17:41:29 +1000
committerQt by Nokia <qt-info@nokia.com>2011-12-01 18:55:39 +0100
commit7980f7aa3f01aeb4e33fab76f495ad7f6c885cc2 (patch)
tree3f8d525d003b2608d8d5a6612d54887f43852019 /tests/auto/declarative/qdeclarativeecmascript
parentc35b80a1e9e1e8bb032d9f4a349fffdcab09d637 (diff)
Autotest
Change-Id: I796ef5e0d70a7e3a95858468583c4ecb447991ee Task-number: QTBUG-21864 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript')
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.js2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.qml6
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp10
3 files changed, 18 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.js b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.js
new file mode 100644
index 0000000000..e1a688ebbe
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.js
@@ -0,0 +1,2 @@
+var a = { b: 10 }
+var test = (typeof a) == "object"
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.qml
new file mode 100644
index 0000000000..a8f679baec
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.qml
@@ -0,0 +1,6 @@
+import "qtbug_21864.js" as Test
+import QtQuick 1.0
+
+QtObject {
+ property bool test: Test.test
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 96383680b6..4891e5088e 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -203,6 +203,7 @@ private slots:
void qtbug_10696();
void qtbug_11606();
void qtbug_11600();
+ void qtbug_21864();
void nonscriptable();
void deleteLater();
void in();
@@ -4851,6 +4852,15 @@ void tst_qdeclarativeecmascript::qtbug_11600()
delete o;
}
+void tst_qdeclarativeecmascript::qtbug_21864()
+{
+ QDeclarativeComponent component(&engine, TEST_FILE("qtbug_21864.qml"));
+ QObject *o = component.create();
+ QVERIFY(o != 0);
+ QCOMPARE(o->property("test").toBool(), true);
+ delete o;
+}
+
// Reading and writing non-scriptable properties should fail
void tst_qdeclarativeecmascript::nonscriptable()
{