summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2011-01-28 12:58:15 +1000
committerBea Lam <bea.lam@nokia.com>2011-01-28 15:12:35 +1000
commitde223987715ad747496099165121aabdc38c8b0a (patch)
treefca28ff2654539732465f79b9d78f12d366d45bb /src/declarative/qml/qdeclarativeobjectscriptclass.cpp
parent92488ca7e538e6bcf87d5cea4a78c39bb26346b7 (diff)
Fix test breakage for qdeclarativeworkerscript
Broken by 43b8305367156c1ceb09eb4a056bdae3f325b5eb.
Diffstat (limited to 'src/declarative/qml/qdeclarativeobjectscriptclass.cpp')
-rw-r--r--src/declarative/qml/qdeclarativeobjectscriptclass.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
index ee47d0bbb9..2aa2059e07 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 *> >());