From de223987715ad747496099165121aabdc38c8b0a Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Fri, 28 Jan 2011 12:58:15 +1000
Subject: Fix test breakage for qdeclarativeworkerscript

Broken by 43b8305367156c1ceb09eb4a056bdae3f325b5eb.
---
 src/declarative/qml/qdeclarativeobjectscriptclass.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
index ee47d0b..2aa2059 100644
--- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
@@ -392,7 +392,9 @@ void QDeclarativeObjectScriptClass::setProperty(QObject *obj,
         QString error = QLatin1String("Cannot assign [undefined] to ") +
                         QLatin1String(QMetaType::typeName(lastData->propType));
         context->throwError(error);
-    } else if (!value.isFunction()) {
+    } else if (value.isFunction() && !value.isRegExp()) {
+        // this is handled by the binding creation above
+    } else {
         QVariant v;
         if (lastData->flags & QDeclarativePropertyCache::Data::IsQList)
             v = enginePriv->scriptValueToVariant(value, qMetaTypeId<QList<QObject *> >());
-- 
cgit v0.12