From 5272bfe03522e671e832a8cbd9e5b2d4d71a18f2 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Fri, 25 Jun 2010 13:22:08 +1000
Subject: Fix assert

QTBUG-11600
---
 src/declarative/qml/qdeclarativetypenamescriptclass.cpp       |  4 ++--
 .../declarative/qdeclarativeecmascript/data/qtbug_11600.js    |  1 +
 .../declarative/qdeclarativeecmascript/data/qtbug_11600.qml   |  8 ++++++++
 .../qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp     | 11 +++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.js
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.qml

diff --git a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
index 2a3417a..764a8db 100644
--- a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
+++ b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
@@ -107,8 +107,7 @@ QDeclarativeTypeNameScriptClass::queryProperty(Object *obj, const Identifier &na
             return 0;
         }
 
-    } else {
-        Q_ASSERT(data->type);
+    } else if (data->type) {
 
         QString strName = toString(name);
 
@@ -134,6 +133,7 @@ QDeclarativeTypeNameScriptClass::queryProperty(Object *obj, const Identifier &na
             if (!object) return 0;
             return ep->objectClass->queryProperty(object, name, flags, 0);
         }
+
     }
 
     return 0;
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.js b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.js
new file mode 100644
index 0000000..092bc2b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.js
@@ -0,0 +1 @@
+;
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.qml
new file mode 100644
index 0000000..56e7885
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.qml
@@ -0,0 +1,8 @@
+import Qt 4.7
+import "qtbug_11600.js" as Test
+
+QtObject {
+    id: goo
+
+    property bool test: undefined == goo.Test.foo
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 7e8a272..5619f22 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -156,6 +156,7 @@ private slots:
     void function();
     void qtbug_10696();
     void qtbug_11606();
+    void qtbug_11600();
 
     void include();
 
@@ -2513,6 +2514,16 @@ void tst_qdeclarativeecmascript::qtbug_11606()
     delete o;
 }
 
+void tst_qdeclarativeecmascript::qtbug_11600()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("qtbug_11600.qml"));
+    QObject *o = component.create();
+    QVERIFY(o != 0);
+    QCOMPARE(o->property("test").toBool(), true);
+    delete o;
+}
+
+
 QTEST_MAIN(tst_qdeclarativeecmascript)
 
 #include "tst_qdeclarativeecmascript.moc"
-- 
cgit v0.12