summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeengine.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-04-15 07:48:56 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-04-15 07:50:44 (GMT)
commit2c9ff8dc79b69b310a568f7457838753abbf2178 (patch)
tree974ac90d252e9b748b5e2296faecb00acd4967e8 /src/declarative/qml/qdeclarativeengine.cpp
parent0b3ade40922ecb06e3f67be96973322f8440bef9 (diff)
downloadQt-2c9ff8dc79b69b310a568f7457838753abbf2178.zip
Qt-2c9ff8dc79b69b310a568f7457838753abbf2178.tar.gz
Qt-2c9ff8dc79b69b310a568f7457838753abbf2178.tar.bz2
Support valuetypes as method return values
QTBUG-9818
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine.cpp')
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 1deadb2..96145fb 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1365,7 +1365,9 @@ QScriptValue QDeclarativeEnginePrivate::scriptValueFromVariant(const QVariant &v
rv.setProperty(ii, objectClass->newQObject(object));
}
return rv;
- }
+ } else if (QDeclarativeValueType *vt = valueTypes[val.userType()]) {
+ return valueTypeClass->newObject(val, vt);
+ }
bool objOk;
QObject *obj = QDeclarativeMetaType::toQObject(val, &objOk);